diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-19 13:32:34 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-19 13:32:34 -0400 |
| commit | 382f1c431ac0ccdec0e07f18c07efcf44459d2cb (patch) | |
| tree | 90380f8ce9af65d9f4a6efc146965517fcb06961 | |
| parent | 39ec8cff7a3bcea4aa87b176e9c8d75af55de6f8 (diff) | |
Really compile fix this time I mean it.
| -rw-r--r-- | src/sisusb_cursor.c | 4 | ||||
| -rw-r--r-- | src/sisusb_driver.c | 4 | ||||
| -rw-r--r-- | src/sisusb_opt.c | 4 | ||||
| -rw-r--r-- | src/sisusb_video.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/sisusb_cursor.c b/src/sisusb_cursor.c index 1de1554..b5b3629 100644 --- a/src/sisusb_cursor.c +++ b/src/sisusb_cursor.c @@ -166,7 +166,7 @@ SiSUSBUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) return TRUE; } -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR static Bool @@ -279,7 +279,7 @@ SiSUSBHWCursorInit(ScreenPtr pScreen) infoPtr->SetCursorColors = SiSUSBSetCursorColors; infoPtr->LoadCursorImage = SiSUSBLoadCursorImage; infoPtr->UseHWCursor = SiSUSBUseHWCursor; -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR if(pSiSUSB->OptUseColorCursor) { diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index 2cc526f..290764d 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -823,7 +823,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) } #endif #else -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) if(xf86GetVersion() != XF86_VERSION_CURRENT) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "This driver binary is not compiled for this version of " SISUSBMYSERVERNAME "\n"); @@ -1995,7 +1995,7 @@ SISUSBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) pSiSUSB->xv_sisdirectunlocked = 0; #ifdef SIS_GLOBAL_ENABLEXV -#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0,0)) || (defined(XvExtension)) +#if (XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,99,0)) || (defined(XvExtension)) if(!pSiSUSB->NoXvideo) { SISUSBInitVideo(pScreen); } diff --git a/src/sisusb_opt.c b/src/sisusb_opt.c index 491d1ce..d4612b0 100644 --- a/src/sisusb_opt.c +++ b/src/sisusb_opt.c @@ -287,7 +287,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) pSiSUSB->HideHWCursor = FALSE; pSiSUSB->HWCursorIsVisible = FALSE; -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0) pSiSUSB->OptUseColorCursor = 0; #else pSiSUSB->OptUseColorCursor = 1; @@ -343,7 +343,7 @@ SiSUSBOptions(ScrnInfoPtr pScrn) * Enable/disable color hardware cursor * */ -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0) +#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0) #ifdef ARGB_CURSOR #ifdef SIS_ARGB_CURSOR if(pSiSUSB->HWCursor) { diff --git a/src/sisusb_video.c b/src/sisusb_video.c index 13db9c3..bc469b0 100644 --- a/src/sisusb_video.c +++ b/src/sisusb_video.c @@ -561,7 +561,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) } #ifdef SIS_ENABLEXV -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) static Bool RegionsEqual(RegionPtr A, RegionPtr B) { @@ -1654,7 +1654,7 @@ SISUSBPutImage( /* update cliplist */ if(pPriv->autopaintColorKey && (pPriv->grabbedByV4L || -#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3,0) +#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,3,99,3) (!RegionsEqual(&pPriv->clip, clipBoxes)) || #else (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) || |