diff options
| -rw-r--r-- | src/common_compat.h | 13 | ||||
| -rw-r--r-- | src/vmware_bootstrap.c | 5 | ||||
| -rw-r--r-- | vmwgfx/vmwgfx_layout.c | 5 | ||||
| -rw-r--r-- | vmwgfx/vmwgfx_output.c | 1 |
4 files changed, 21 insertions, 3 deletions
diff --git a/src/common_compat.h b/src/common_compat.h index 5c46a73..3cd3139 100644 --- a/src/common_compat.h +++ b/src/common_compat.h @@ -20,5 +20,18 @@ #define CONST_ABI_16_TO_19 #endif +#if (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 13) +static inline void +xf86SaveModeContents(DisplayModePtr intern, const DisplayModeRec *mode) +{ + *intern = *mode; + intern->prev = intern->next = NULL; + intern->name = NULL; + intern->PrivSize = 0; + intern->PrivFlags = 0; + intern->Private = NULL; +} +#endif + #endif diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c index 20c041e..0cfac57 100644 --- a/src/vmware_bootstrap.c +++ b/src/vmware_bootstrap.c @@ -80,10 +80,9 @@ #define VMW_INNERSTRINGIFY(s) #s #define VMW_STRING(str) VMW_INNERSTRINGIFY(str) -#define VMWARE_NAME "vmware" #define VMWARE_DRIVER_NAME "vmware" +#define VMWARE_NAME "vmware" -static char vmware_name[] = VMWARE_NAME; static char vmware_driver_name[] = VMWARE_DRIVER_NAME; #define VMWARE_DRIVER_VERSION \ @@ -95,6 +94,8 @@ static char vmware_driver_name[] = VMWARE_DRIVER_NAME; #if !XSERVER_LIBPCIACCESS static const char VMWAREBuildStr[] = "VMware Guest X Server " VMWARE_DRIVER_VERSION_STRING " - build=$Name$\n"; +#else +static char vmware_name[] = VMWARE_NAME; #endif /* diff --git a/vmwgfx/vmwgfx_layout.c b/vmwgfx/vmwgfx_layout.c index 2c67dd5..55a53be 100644 --- a/vmwgfx/vmwgfx_layout.c +++ b/vmwgfx/vmwgfx_layout.c @@ -32,6 +32,11 @@ #include "vmwgfx_driver.h" #include <xf86Crtc.h> #include "vmwgfx_rr_inlines.h" +#include "../src/common_compat.h" + +#ifndef X_DEBUG +#define X_DEBUG X_NOTICE +#endif /** * struct vmwgfx_layout_box - Struct representing a GUI layout rect diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c index 486514a..ec31e2c 100644 --- a/vmwgfx/vmwgfx_output.c +++ b/vmwgfx/vmwgfx_output.c @@ -33,7 +33,6 @@ #include "xorg-server.h" #include <xf86drm.h> -#include <xf86drmMode.h> #include <xf86str.h> #include <randrstr.h> #include <xf86Crtc.h> |