XLibre/xf86-video-vmware
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-vmware.git synced 2026-03-24 01:24:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmware: Fix bootstrap related compile errors on earlier X servers

Browse Source 
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>
This commit is contained in:
Thomas Hellstrom
2014-08-28 13:43:03 +02:00
parent f5d8c8f1fe
commit 8a47e9a450
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vmware_bootstrap.c
View File

@@ -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
};