diff options
| author | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-17 19:16:48 -0400 |
|---|---|---|
| committer | Vinay Bondhugula <vinayb@vmware.com> | 2008-04-17 19:16:48 -0400 |
| commit | 87e9b32618f037d78d7853b48e40a71533b764d2 (patch) | |
| tree | 4f4afe697c9897718541f79201f02bc2a30158af /src | |
| parent | e4fa13951a7c5dd53005a63392a439e2329fab9c (diff) | |
Fix build for all modular versions of Xorg
This change makes the video driver compile with Xorg 7.0. There are a couple of
trivial changes that bring down the maximum Xserver version down to 2.0. Hacky,
but good enough for now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmware.h | 3 | ||||
| -rw-r--r-- | src/vmwarevideo.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/vmware.h b/src/vmware.h index 7edefd5..ac93706 100644 --- a/src/vmware.h +++ b/src/vmware.h @@ -8,7 +8,10 @@ #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) #include <string.h> +#endif #include "xf86.h" #include "xf86_OSproc.h" diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c index 3b8aaa6..613991c 100644 --- a/src/vmwarevideo.c +++ b/src/vmwarevideo.c @@ -170,7 +170,7 @@ typedef VMWAREVideoRec *VMWAREVideoPtr; /* * Callback functions */ -#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4, 0, 0, 0, 0) +#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(7, 0, 0, 0, 0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(2, 0, 0, 0, 0) 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, |