diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-07 05:12:41 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-12-07 05:12:41 -0200 |
| commit | bf4c29ab48a166eb158cf4be7c597982d65ef214 (patch) | |
| tree | e328feaf9b5e278f378650cfae1247104227ac10 /hw/xfree86/common/xf86Priv.h | |
| parent | b1dac41fb3853ca8182048ea57b88b6e84ecceb3 (diff) | |
Correct xf86acpiDisableFlag symbol.
It is declared as
<hash>ifdef HAVE_ACPI
Bool xf86acpiDisableFlag = FALSE;
<hash>endif
in hw/xfree86/common/xf86Globals.c
but not protected by the ifdef in the sdk header xf86Priv.h, what
caused a build failure in the tinderbox, due to the address of the
symbol being taken (to ensure it is available) in sdksyms.c.
Diffstat (limited to 'hw/xfree86/common/xf86Priv.h')
| -rw-r--r-- | hw/xfree86/common/xf86Priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 1196064cc..845744338 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -56,7 +56,9 @@ extern _X_EXPORT Bool xf86sFlag; extern _X_EXPORT Bool xf86bsEnableFlag; extern _X_EXPORT Bool xf86bsDisableFlag; extern _X_EXPORT Bool xf86silkenMouseDisableFlag; +#ifdef HAVE_ACPI extern _X_EXPORT Bool xf86acpiDisableFlag; +#endif extern _X_EXPORT char *xf86LayoutName; extern _X_EXPORT char *xf86ScreenName; extern _X_EXPORT char *xf86PointerName; |