diff options
-rw-r--r-- | hw/xfree86/ddc/xf86DDC.h | 2 | ||||
-rw-r--r-- | hw/xfree86/vgahw/vgaHW.c | 2 | ||||
-rw-r--r-- | hw/xfree86/vgahw/vgaHW.h | 2 | ||||
-rw-r--r-- | miext/shadow/shadow.h | 10 | ||||
-rw-r--r-- | miext/shadow/shpacked.c | 2 | ||||
-rw-r--r-- | miext/shadow/shplanar.c | 4 | ||||
-rw-r--r-- | miext/shadow/shrotate.c | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index ca866c69f..3d94fd976 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -24,7 +24,7 @@ typedef enum { DDC_FAST } xf86ddcSpeed; -typedef void * DDC1SetSpeedProc (ScrnInfoPtr, xf86ddcSpeed); +typedef void (* DDC1SetSpeedProc)(ScrnInfoPtr, xf86ddcSpeed); extern xf86MonPtr xf86DoEDID_DDC1( int scrnIndex, diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 608ab7c32..2e12f00ac 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -1995,6 +1995,6 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) } } -DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; } +DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; } SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; } diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 3252dd787..2874c2cfb 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -231,7 +231,7 @@ CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, unsigned int Flags); Bool vgaHWAllocDefaultRegs(vgaRegPtr regp); -DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void); +DDC1SetSpeedProc vgaHWddc1SetSpeedWeak(void); SaveScreenProcPtr vgaHWSaveScreenWeak(void); #endif /* _VGAHW_H */ diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index 7f6ceb850..d301916e4 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -163,12 +163,12 @@ void shadowUpdateRotate32_270 (ScreenPtr pScreen, shadowBufPtr pBuf); -typedef void * shadowUpdateProc(ScreenPtr, shadowBufPtr); +typedef void (* shadowUpdateProc)(ScreenPtr, shadowBufPtr); -shadowUpdateProc *shadowUpdatePackedWeak(void); -shadowUpdateProc *shadowUpdatePlanar4Weak(void); -shadowUpdateProc *shadowUpdatePlanar4x8Weak(void); -shadowUpdateProc *shadowUpdateRotatePackedWeak(void); +shadowUpdateProc shadowUpdatePackedWeak(void); +shadowUpdateProc shadowUpdatePlanar4Weak(void); +shadowUpdateProc shadowUpdatePlanar4x8Weak(void); +shadowUpdateProc shadowUpdateRotatePackedWeak(void); void shadowWrapGC (GCPtr pGC); diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 08785c000..de2643e9f 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -107,4 +107,4 @@ shadowUpdatePacked (ScreenPtr pScreen, } } -shadowUpdateProc *shadowUpdatePackedWeak(void) { return shadowUpdatePacked; } +shadowUpdateProc shadowUpdatePackedWeak(void) { return shadowUpdatePacked; } diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index b5818f2bd..3b842d57b 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -166,10 +166,10 @@ shadowUpdatePlanar4 (ScreenPtr pScreen, } } -shadowUpdateProc *shadowUpdatePlanar4Weak(void) { +shadowUpdateProc shadowUpdatePlanar4Weak(void) { return shadowUpdatePlanar4; } -shadowUpdateProc *shadowUpdatePlanar4x8Weak(void) { +shadowUpdateProc shadowUpdatePlanar4x8Weak(void) { return shadowUpdatePlanar4x8; } diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index 47ead25b7..620559e69 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -305,6 +305,6 @@ shadowUpdateRotatePacked (ScreenPtr pScreen, } } -shadowUpdateProc *shadowUpdateRotatePackedWeak(void) { +shadowUpdateProc shadowUpdateRotatePackedWeak(void) { return shadowUpdateRotatePacked; } |