diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2014-08-28 13:43:03 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2014-08-28 15:41:17 +0200 |
| commit | 8a47e9a45036005d46a60cf8df366baffcb9a8d1 (patch) | |
| tree | 83a8be76c667d41c171bb7ba99fa2af8cc6c452e | |
| parent | f5d8c8f1fe2de727018600f471b6a8829fe492ad (diff) | |
vmware: Fix bootstrap related compile errors on earlier X servers
Introduced by commit
Add support for XSERVER_PLATFORM_BUS
Note that the vmware DriverRec declaration can be cleaned up
considerably using C99 designated initializers. Perhaps something for
the next release...
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
| -rw-r--r-- | src/vmware_bootstrap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c index 1635876..d7ab070 100644 --- a/src/vmware_bootstrap.c +++ b/src/vmware_bootstrap.c @@ -30,7 +30,6 @@ #endif #include "xf86.h" -#include <xorgVersion.h> #include "compiler.h" #include "xf86Pci.h" /* pci */ #include "vm_device_version.h" @@ -497,7 +496,7 @@ VMWareDriverFunc(ScrnInfoPtr pScrn, pScrn->yDpi / 2) / pScrn->yDpi; } return TRUE; -#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0) +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 18 case SUPPORTS_SERVER_FDS: return TRUE; #endif @@ -523,6 +522,7 @@ _X_EXPORT DriverRec vmware = { #if VMWARE_DRIVER_FUNC VMWareDriverFunc, #endif +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 4 #if XSERVER_LIBPCIACCESS VMwareDeviceMatch, VMwarePciProbe, @@ -530,11 +530,14 @@ _X_EXPORT DriverRec vmware = { NULL, NULL, #endif +#endif +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 13 #ifdef XSERVER_PLATFORM_BUS VMwarePlatformProbe, #else NULL, #endif +#endif }; |