summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Kuehling <felix.kuehling@amd.com>2009-06-30 20:07:30 -0400
committerAlex Deucher <alexdeucher@gmail.com>2009-06-30 20:07:30 -0400
commit3525d140567e0ad5f0184e4b37893c47239e1628 (patch)
tree120a8a92cf01df40c6f59cde321a3029e62d0e43
parente13605ea40cfc671314a0086c75b917564298b55 (diff)
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.
-rw-r--r--hw/xfree86/common/xf86Config.h2
-rw-r--r--hw/xfree86/common/xf86Globals.c1
-rw-r--r--hw/xfree86/ramdac/xf86CursorPriv.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
index a174e463b..53188941f 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 a14f20cfd..7bcbc94dd 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 f82be2edc..32be9c2f3 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 */