From db027200474684c0aa4b9387f3ed53b2e5f24478 Mon Sep 17 00:00:00 2001
From: Vinay Bondhugula <vinayb@vmware.com>
Date: Tue, 22 Apr 2008 14:18:45 -0400
Subject: More xorg and xfree86 backwards compatibility

Push most of the xorg-server version checking into the configure script. With
this change, unmodified driver source compiles in the XFree86 4.3 tree.
---
 src/vmware.h      | 9 ++++++---
 src/vmwarevideo.c | 8 ++------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/vmware.h b/src/vmware.h
index 63bb831..bb1234d 100644
--- a/src/vmware.h
+++ b/src/vmware.h
@@ -8,8 +8,12 @@
 #ifndef VMWARE_H
 #define VMWARE_H
 
-#include "xorgVersion.h"
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(7, 1, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(2, 0, 0, 0, 0)
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_XORG_SERVER_1_1_0
 #include <string.h>
 #endif
 
@@ -19,7 +23,6 @@
 
 #include <X11/extensions/panoramiXproto.h>
 
-#include "xorg-server.h"
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
 #endif
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
index d6ff4b7..a0a7781 100644
--- a/src/vmwarevideo.c
+++ b/src/vmwarevideo.c
@@ -45,10 +45,6 @@
 #include "svga_overlay.h"
 
 #include <X11/extensions/Xv.h>
-/*
- * Need this to figure out which prototype to use for XvPutImage
- */
-#include "xorgVersion.h"
 
 #define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
 
@@ -170,7 +166,7 @@ typedef VMWAREVideoRec *VMWAREVideoPtr;
 /*
  * Callback functions
  */
-#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(2, 0, 0, 0, 0)
+#ifdef HAVE_XORG_SERVER_1_0_99_901
 static int vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
                             short drw_x, short drw_y, short src_w, short src_h,
                             short drw_w, short drw_h, int image,
@@ -968,7 +964,7 @@ static void vmwareVideoEndStream(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid)
  *-----------------------------------------------------------------------------
  */
 
-#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4, 0, 0, 0, 0)
+#ifdef HAVE_XORG_SERVER_1_0_99_901
 static int vmwareXvPutImage(ScrnInfoPtr pScrn, short src_x, short src_y,
                             short drw_x, short drw_y, short src_w, short src_h,
                             short drw_w, short drw_h, int format,
-- 
cgit v1.2.3