diff options
| -rw-r--r-- | Xext/bigreq.c | 4 | ||||
| -rw-r--r-- | Xext/dpms.c | 2 | ||||
| -rw-r--r-- | Xext/saver.c | 2 | ||||
| -rw-r--r-- | Xext/security.c | 2 | ||||
| -rw-r--r-- | Xext/shm.c | 2 | ||||
| -rw-r--r-- | Xext/xcmisc.c | 2 | ||||
| -rw-r--r-- | Xext/xres.c | 2 | ||||
| -rw-r--r-- | Xext/xselinux_ext.c | 2 | ||||
| -rw-r--r-- | Xext/xtest.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Module.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/dbemodule.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 49 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/xf86dga2.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/recordmod.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/drimodule.c | 3 | ||||
| -rw-r--r-- | mi/miinitext.c | 67 |
16 files changed, 65 insertions, 84 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c index d61ff3c7b..886b761af 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -40,7 +40,7 @@ from The Open Group. #include "opaque.h" #include "modinit.h" -void BigReqExtensionInit(INITARGS); +void BigReqExtensionInit(void); static int ProcBigReqDispatch(ClientPtr client) @@ -70,7 +70,7 @@ ProcBigReqDispatch(ClientPtr client) } void -BigReqExtensionInit(INITARGS) +BigReqExtensionInit(void) { AddExtension(XBigReqExtensionName, 0, 0, ProcBigReqDispatch, ProcBigReqDispatch, diff --git a/Xext/dpms.c b/Xext/dpms.c index 8ec32eac2..8cff8bdea 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -355,7 +355,7 @@ SProcDPMSDispatch(ClientPtr client) } void -DPMSExtensionInit(INITARGS) +DPMSExtensionInit(void) { AddExtension(DPMSExtensionName, 0, 0, ProcDPMSDispatch, SProcDPMSDispatch, diff --git a/Xext/saver.c b/Xext/saver.c index 7f70bc0f4..eefb49765 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1389,7 +1389,7 @@ SProcScreenSaverDispatch(ClientPtr client) } void -ScreenSaverExtensionInit(INITARGS) +ScreenSaverExtensionInit(void) { ExtensionEntry *extEntry; int i; diff --git a/Xext/security.c b/Xext/security.c index 50041deb8..c101b7d2f 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1027,7 +1027,7 @@ SecurityResetProc(ExtensionEntry * extEntry) */ void -SecurityExtensionInit(INITARGS) +SecurityExtensionInit(void) { ExtensionEntry *extEntry; int ret = TRUE; diff --git a/Xext/shm.c b/Xext/shm.c index be10a4964..fd0c41f3e 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1248,7 +1248,7 @@ SProcShmDispatch(ClientPtr client) } void -ShmExtensionInit(INITARGS) +ShmExtensionInit(void) { ExtensionEntry *extEntry; int i; diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 9e4ea896e..cfde3b3a8 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -190,7 +190,7 @@ SProcXCMiscDispatch(ClientPtr client) } void -XCMiscExtensionInit(INITARGS) +XCMiscExtensionInit(void) { AddExtension(XCMiscExtensionName, 0, 0, ProcXCMiscDispatch, SProcXCMiscDispatch, diff --git a/Xext/xres.c b/Xext/xres.c index 25d4417ca..acc5b8cc2 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -1184,7 +1184,7 @@ SProcResDispatch (ClientPtr client) } void -ResExtensionInit(INITARGS) +ResExtensionInit(void) { (void) AddExtension(XRES_NAME, 0, 0, ProcResDispatch, SProcResDispatch, diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c index d22c2f1fd..220e876ea 100644 --- a/Xext/xselinux_ext.c +++ b/Xext/xselinux_ext.c @@ -687,7 +687,7 @@ SELinuxResetProc(ExtensionEntry * extEntry) } void -SELinuxExtensionInit(INITARGS) +SELinuxExtensionInit(void) { ExtensionEntry *extEntry; diff --git a/Xext/xtest.c b/Xext/xtest.c index c7b087bdf..4938e3bb3 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -679,7 +679,7 @@ XTestExtensionTearDown(ExtensionEntry * e) } void -XTestExtensionInit(INITARGS) +XTestExtensionInit(void) { AddExtension(XTestExtensionName, 0, 0, ProcXTestDispatch, SProcXTestDispatch, diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 7671cea5d..9ba874c4b 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -171,7 +171,7 @@ typedef struct { #define INITARGS void -typedef void (*InitExtension) (INITARGS); +typedef void (*InitExtension) (void); typedef struct { InitExtension initFunc; diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index 5541eacab..fea3d9ff7 100644 --- a/hw/xfree86/dixmods/dbemodule.c +++ b/hw/xfree86/dixmods/dbemodule.c @@ -7,7 +7,7 @@ static MODULESETUPPROTO(dbeSetup); -extern void DbeExtensionInit(INITARGS); +extern void DbeExtensionInit(void); static ExtensionModule dbeExt = { DbeExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index e7c744859..4c9b6e3cc 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -3,91 +3,78 @@ #include <dix-config.h> #endif -#ifndef INITARGS -#define INITARGS void -#endif - #include <X11/extensions/shapeproto.h> #ifdef XTEST -extern void XTestExtensionInit(INITARGS); - +extern void XTestExtensionInit(void); #include <X11/extensions/xtestproto.h> #endif #if 1 -extern void XTestExtension1Init(INITARGS); +extern void XTestExtension1Init(void); #endif #if 1 -extern void XCMiscExtensionInit(INITARGS); +extern void XCMiscExtensionInit(void); #endif #ifdef SCREENSAVER -extern void ScreenSaverExtensionInit(INITARGS); - +extern void ScreenSaverExtensionInit(void); #include <X11/extensions/saver.h> #endif #ifdef XF86VIDMODE -extern void XFree86VidModeExtensionInit(INITARGS); - +extern void XFree86VidModeExtensionInit(void); #include <X11/extensions/xf86vmproto.h> #endif #ifdef XFreeXDGA -extern void XFree86DGAExtensionInit(INITARGS); -extern void XFree86DGARegister(INITARGS); - +extern void XFree86DGAExtensionInit(void); +extern void XFree86DGARegister(void); #include <X11/extensions/xf86dgaproto.h> #endif #ifdef DPMSExtension -extern void DPMSExtensionInit(INITARGS); - +extern void DPMSExtensionInit(void); #include <X11/extensions/dpmsconst.h> #endif #ifdef XV -extern void XvExtensionInit(INITARGS); -extern void XvMCExtensionInit(INITARGS); -extern void XvRegister(INITARGS); - +extern void XvExtensionInit(void); +extern void XvMCExtensionInit(void); +extern void XvRegister(void); #include <X11/extensions/Xv.h> #include <X11/extensions/XvMC.h> #endif #ifdef RES -extern void ResExtensionInit(INITARGS); - +extern void ResExtensionInit(void); #include <X11/extensions/XResproto.h> #endif #ifdef SHM -extern void ShmExtensionInit(INITARGS); - #include <X11/extensions/shmproto.h> +extern void ShmExtensionInit(void); extern void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs); #endif #ifdef XSELINUX -extern void SELinuxExtensionInit(INITARGS); - +extern void SELinuxExtensionInit(void); #include "xselinux.h" #endif #ifdef XEVIE -extern void XevieExtensionInit(INITARGS); +extern void XevieExtensionInit(void); #endif #if 1 -extern void SecurityExtensionInit(INITARGS); +extern void SecurityExtensionInit(void); #endif #if 1 -extern void PanoramiXExtensionInit(INITARGS); +extern void PanoramiXExtensionInit(void); #endif #if 1 -extern void XkbExtensionInit(INITARGS); +extern void XkbExtensionInit(void); #endif diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 9b7ec148b..4cae949a7 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -1010,13 +1010,13 @@ ProcXDGADispatch(ClientPtr client) } void -XFree86DGARegister(INITARGS) +XFree86DGARegister(void) { XDGAEventBase = &DGAEventBase; } void -XFree86DGAExtensionInit(INITARGS) +XFree86DGAExtensionInit(void) { ExtensionEntry *extEntry; diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index b75cc3fdb..fe52fa8e5 100644 --- a/hw/xfree86/dixmods/recordmod.c +++ b/hw/xfree86/dixmods/recordmod.c @@ -8,7 +8,7 @@ extern Bool noTestExtensions; static MODULESETUPPROTO(recordSetup); -extern void RecordExtensionInit(INITARGS); +extern void RecordExtensionInit(void); static ExtensionModule recordExt = { RecordExtensionInit, diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 83eca4eb9..eb42ef64a 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -57,8 +57,7 @@ static XF86ModuleVersionInfo VersRec = { {0, 0, 0, 0} }; -extern void XFree86DRIExtensionInit(INITARGS); - +extern void XFree86DRIExtensionInit(void); #define _XF86DRI_SERVER_ #include <X11/dri/xf86driproto.h> diff --git a/mi/miinitext.c b/mi/miinitext.c index ca21b6fe5..13e1b68ea 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -96,8 +96,7 @@ SOFTWARE. extern Bool noGEExtension; #ifndef XFree86LOADER -#define INITARGS void -typedef void (*InitExtension) (INITARGS); +typedef void (*InitExtension) (void); #else /* XFree86Loader */ #include "loaderProcs.h" #endif @@ -128,84 +127,80 @@ typedef void (*InitExtension) (INITARGS); /* FIXME: this whole block of externs should be from the appropriate headers */ #ifdef MITSHM -extern void ShmExtensionInit(INITARGS); +extern void ShmExtensionInit(void); #endif #ifdef PANORAMIX -extern void PanoramiXExtensionInit(INITARGS); +extern void PanoramiXExtensionInit(void); #endif #ifdef INXQUARTZ -extern void PseudoramiXExtensionInit(INITARGS); +extern void PseudoramiXExtensionInit(void); #endif -extern void XInputExtensionInit(INITARGS); - +extern void XInputExtensionInit(void); #ifdef XTEST -extern void XTestExtensionInit(INITARGS); +extern void XTestExtensionInit(void); #endif -extern void BigReqExtensionInit(INITARGS); - +extern void BigReqExtensionInit(void); #ifdef SCREENSAVER -extern void ScreenSaverExtensionInit(INITARGS); +extern void ScreenSaverExtensionInit(void); #endif #ifdef XV -extern void XvExtensionInit(INITARGS); -extern void XvMCExtensionInit(INITARGS); +extern void XvExtensionInit(void); +extern void XvMCExtensionInit(void); #endif -extern void SyncExtensionInit(INITARGS); -extern void XkbExtensionInit(INITARGS); -extern void XCMiscExtensionInit(INITARGS); - +extern void SyncExtensionInit(void); +extern void XkbExtensionInit(void); +extern void XCMiscExtensionInit(void); #ifdef XRECORD -extern void RecordExtensionInit(INITARGS); +extern void RecordExtensionInit(void); #endif #ifdef DBE -extern void DbeExtensionInit(INITARGS); +extern void DbeExtensionInit(void); #endif #ifdef XCSECURITY -extern void SecurityExtensionInit(INITARGS); +extern void SecurityExtensionInit(void); #endif #ifdef XSELINUX -extern void SELinuxExtensionInit(INITARGS); +extern void SELinuxExtensionInit(void); #endif #ifdef XF86BIGFONT -extern void XFree86BigfontExtensionInit(INITARGS); +extern void XFree86BigfontExtensionInit(void); #endif #ifdef XF86VIDMODE -extern void XFree86VidModeExtensionInit(INITARGS); +extern void XFree86VidModeExtensionInit(void); #endif #ifdef XFreeXDGA -extern void XFree86DGAExtensionInit(INITARGS); +extern void XFree86DGAExtensionInit(void); #endif #ifdef GLXEXT typedef struct __GLXprovider __GLXprovider; extern __GLXprovider __glXDRISWRastProvider; -extern void GlxPushProvider(__GLXprovider * impl); -extern void GlxExtensionInit(INITARGS); +extern void GlxPushProvider(__GLXprovider *impl); +extern void GlxExtensionInit(void); #endif #ifdef XF86DRI -extern void XFree86DRIExtensionInit(INITARGS); +extern void XFree86DRIExtensionInit(void); #endif #ifdef DPMSExtension -extern void DPMSExtensionInit(INITARGS); +extern void DPMSExtensionInit(void); #endif -extern void RenderExtensionInit(INITARGS); - +extern void RenderExtensionInit(void); #ifdef RANDR -extern void RRExtensionInit(INITARGS); +extern void RRExtensionInit(void); #endif #ifdef RES -extern void ResExtensionInit(INITARGS); +extern void ResExtensionInit(void); #endif #ifdef DMXEXT -extern void DMXExtensionInit(INITARGS); +extern void DMXExtensionInit(void); #endif #ifdef XFIXES -extern void XFixesExtensionInit(INITARGS); +extern void XFixesExtensionInit(void); #endif #ifdef DAMAGE -extern void DamageExtensionInit(INITARGS); +extern void DamageExtensionInit(void); #endif #ifdef COMPOSITE -extern void CompositeExtensionInit(INITARGS); +extern void CompositeExtensionInit(void); #endif /* The following is only a small first step towards run-time |