Build fixes

A couple of more build fixes for older X servers.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>

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
 

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
 
 /*

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

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>