From: Michel Dänzer <daenzer@vmware.com>
Date: Tue, 29 Dec 2009 15:41:16 +0000 (+0100)
Subject: vmware: Fix crash with xserver >= 1.7.
X-Git-Tag: xf86-video-vmware-10.16.9~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bec18ab8dffd90ab84b986de2136a9d848d3a4a;p=platform%2Fupstream%2Fxf86-video-vmware.git

vmware: Fix crash with xserver >= 1.7.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24541 .
---

diff --git a/configure.ac b/configure.ac
index af3deb5..dc781ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ PKG_CHECK_EXISTS([xorg-server >= 1.2.0],
                  [AC_DEFINE([HAVE_XORG_SERVER_1_2_0], 1,
                  [Has version 1.2.0 or greater of the Xserver])])
 
+PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
+                 [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
+                 [Has version 1.7.0 or greater of the Xserver])])
+
 
 # Checks for libraries.
 
diff --git a/src/vmware.c b/src/vmware.c
index 6004677..a1575dd 100644
--- a/src/vmware.c
+++ b/src/vmware.c
@@ -146,6 +146,13 @@ static PciChipsets VMWAREPciChipsets[] = {
     { -1,		       -1,		    RES_UNDEFINED }
 };
 
+#if HAVE_XORG_SERVER_1_7_0
+
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+
+#else
+
 static const char *vgahwSymbols[] = {
     "vgaHWGetHWRec",
     "vgaHWGetIOBase",
@@ -178,6 +185,8 @@ static const char *shadowfbSymbols[] = {
     NULL
 };
 
+#endif /* HAVE_XORG_SERVER_1_7_0 */
+
 #ifdef XFree86LOADER
 static XF86ModuleVersionInfo vmwareVersRec = {
     "vmware",