xserver: Branch 'master'

[Alex Deucher]

 hw/xfree86/common/xf86Config.h     |    2 +-
 hw/xfree86/common/xf86Globals.c    |    1 +
 hw/xfree86/ramdac/xf86CursorPriv.h |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3525d140567e0ad5f0184e4b37893c47239e1628
Author: Felix Kuehling <felix.kuehling at amd.com>
Date:   Tue Jun 30 20:07:30 2009 -0400

    Export symbols needed by the RandR implementation in fglrx
    
    GIT change
    http://cgit.freedesktop.org/xorg/xserver/commit/?id=45c8bd0fe54273039fdaa1eeeafb81b5774f2c75
    changed the default symbol visibility of the Xserver. As a result 2 symbols
    that are needed by the RandR 1.2/1.3 implementation in the fglrx driver are no
    longer visible:
    
    xf86configptr
    xf86CursorScreenKey
    
    We would like to get these two symbols _X_EXPORT'ed before Xserver 1.7 is
    released. Otherwise it will be problematic for fglrx to support RandR 1.3 on
    Xserver 1.7.
    
    In the future, we may want to sync our RandR implementation to later versions
    of the RandR implementation in hw/xfree86/modes. Therefore it would be nice if
    all symbols used by the Xserver RandR implementation were _X_EXPORT'ed in the
    future.

diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index a174e46..5318894 100644
--- a/hw/xfree86/common/xf86Config.h
+++ b/hw/xfree86/common/xf86Config.h
@@ -41,7 +41,7 @@
 /*
  * global structure that holds the result of parsing the config file
  */
-extern XF86ConfigPtr xf86configptr;
+extern _X_EXPORT XF86ConfigPtr xf86configptr;
 #endif
 
 typedef enum _ConfigStatus {
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index a14f20c..7bcbc94 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -43,6 +43,7 @@
 #include "xf86Parser.h"
 #include "xf86Xinput.h"
 #include "xf86InPriv.h"
+#include "xf86Config.h"
 
 /* Globals that video drivers may access */
 
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index f82be2e..32be9c2 100644
--- a/hw/xfree86/ramdac/xf86CursorPriv.h
+++ b/hw/xfree86/ramdac/xf86CursorPriv.h
@@ -45,6 +45,6 @@ Bool xf86InitHardwareCursor(ScreenPtr pScreen, xf86CursorInfoPtr infoPtr);
 
 CARD32 xf86ReverseBitOrder(CARD32 data);
 
-extern DevPrivateKey xf86CursorScreenKey;
+extern _X_EXPORT DevPrivateKey xf86CursorScreenKey;
 
 #endif /* _XF86CURSORPRIV_H */