diff options
| author | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-22 14:18:45 -0400 |
|---|---|---|
| committer | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-22 14:18:45 -0400 |
| commit | db027200474684c0aa4b9387f3ed53b2e5f24478 (patch) | |
| tree | 4d5639a7df1f6633f247cde7a4e6f3f32ec768fd /src/vmware.h | |
| parent | 6849c0a5fbf10722ca475d2ffcce7d0d95d2377a (diff) | |
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.
Diffstat (limited to 'src/vmware.h')
| -rw-r--r-- | src/vmware.h | 9 |
1 files changed, 6 insertions, 3 deletions
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 |