diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-15 14:27:14 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-15 14:27:14 -0400 |
| commit | a92ba1876d63464e85cea00a6f5e70800465cb41 (patch) | |
| tree | 3787407e5dbe4061eaac0f7d4bbcfd6cad759813 | |
| parent | bfb07a5de1c396d8fd9c26da2266c4721ee929b8 (diff) | |
Build fix.
| -rw-r--r-- | src/sisusb.h | 2 | ||||
| -rw-r--r-- | src/sisusb_types.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/sisusb.h b/src/sisusb.h index 36f9f3a..3852819 100644 --- a/src/sisusb.h +++ b/src/sisusb.h @@ -95,7 +95,7 @@ #include "xorgVersion.h" #define SISUSBMYSERVERNAME "X.org" #ifndef XF86_VERSION_NUMERIC -#define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \ +#define XF86_VERSION_NUMERIC(major,minor,patch,snap) \ (((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap) #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902) #endif diff --git a/src/sisusb_types.h b/src/sisusb_types.h index 04d9ff9..04c7a7a 100644 --- a/src/sisusb_types.h +++ b/src/sisusb_types.h @@ -93,12 +93,7 @@ typedef unsigned char BOOLEAN; #define SISIOMEMTYPE -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) -typedef unsigned long IOADDRESS; -typedef unsigned long SISIOADDRESS; -#else typedef IOADDRESS SISIOADDRESS; -#endif typedef enum _SIS_CHIP_TYPE { SIS_VGALegacy = 0, |