xserver: Branch 'master'

[Paulo Cesar Pereira de Andrade]

 hw/xfree86/common/xf86Priv.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit bf4c29ab48a166eb158cf4be7c597982d65ef214
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date:   Sun Dec 7 05:12:41 2008 -0200

    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.

diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h
index 1196064..8457443 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;