Replace INITARGS with void
INITARGS was a hardcoded define to void. Since knowing the function signature for your extensions is kinda useful, just replace it with a hardcoded void, but leave the define there for API compatibility. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
bddb8c6cbe
commit
5079db78ae
|
@ -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,
|
||||
|
|
|
@ -355,7 +355,7 @@ SProcDPMSDispatch(ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
DPMSExtensionInit(INITARGS)
|
||||
DPMSExtensionInit(void)
|
||||
{
|
||||
AddExtension(DPMSExtensionName, 0, 0,
|
||||
ProcDPMSDispatch, SProcDPMSDispatch,
|
||||
|
|
|
@ -1389,7 +1389,7 @@ SProcScreenSaverDispatch(ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
ScreenSaverExtensionInit(INITARGS)
|
||||
ScreenSaverExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
int i;
|
||||
|
|
|
@ -1027,7 +1027,7 @@ SecurityResetProc(ExtensionEntry * extEntry)
|
|||
*/
|
||||
|
||||
void
|
||||
SecurityExtensionInit(INITARGS)
|
||||
SecurityExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
int ret = TRUE;
|
||||
|
|
|
@ -1248,7 +1248,7 @@ SProcShmDispatch(ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
ShmExtensionInit(INITARGS)
|
||||
ShmExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
int i;
|
||||
|
|
|
@ -190,7 +190,7 @@ SProcXCMiscDispatch(ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
XCMiscExtensionInit(INITARGS)
|
||||
XCMiscExtensionInit(void)
|
||||
{
|
||||
AddExtension(XCMiscExtensionName, 0, 0,
|
||||
ProcXCMiscDispatch, SProcXCMiscDispatch,
|
||||
|
|
|
@ -1184,7 +1184,7 @@ SProcResDispatch (ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
ResExtensionInit(INITARGS)
|
||||
ResExtensionInit(void)
|
||||
{
|
||||
(void) AddExtension(XRES_NAME, 0, 0,
|
||||
ProcResDispatch, SProcResDispatch,
|
||||
|
|
|
@ -687,7 +687,7 @@ SELinuxResetProc(ExtensionEntry * extEntry)
|
|||
}
|
||||
|
||||
void
|
||||
SELinuxExtensionInit(INITARGS)
|
||||
SELinuxExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
|
||||
|
|
|
@ -679,7 +679,7 @@ XTestExtensionTearDown(ExtensionEntry * e)
|
|||
}
|
||||
|
||||
void
|
||||
XTestExtensionInit(INITARGS)
|
||||
XTestExtensionInit(void)
|
||||
{
|
||||
AddExtension(XTestExtensionName, 0, 0,
|
||||
ProcXTestDispatch, SProcXTestDispatch,
|
||||
|
|
|
@ -171,7 +171,7 @@ typedef struct {
|
|||
|
||||
#define INITARGS void
|
||||
|
||||
typedef void (*InitExtension) (INITARGS);
|
||||
typedef void (*InitExtension) (void);
|
||||
|
||||
typedef struct {
|
||||
InitExtension initFunc;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
static MODULESETUPPROTO(dbeSetup);
|
||||
|
||||
extern void DbeExtensionInit(INITARGS);
|
||||
extern void DbeExtensionInit(void);
|
||||
|
||||
static ExtensionModule dbeExt = {
|
||||
DbeExtensionInit,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1010,13 +1010,13 @@ ProcXDGADispatch(ClientPtr client)
|
|||
}
|
||||
|
||||
void
|
||||
XFree86DGARegister(INITARGS)
|
||||
XFree86DGARegister(void)
|
||||
{
|
||||
XDGAEventBase = &DGAEventBase;
|
||||
}
|
||||
|
||||
void
|
||||
XFree86DGAExtensionInit(INITARGS)
|
||||
XFree86DGAExtensionInit(void)
|
||||
{
|
||||
ExtensionEntry *extEntry;
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ extern Bool noTestExtensions;
|
|||
|
||||
static MODULESETUPPROTO(recordSetup);
|
||||
|
||||
extern void RecordExtensionInit(INITARGS);
|
||||
extern void RecordExtensionInit(void);
|
||||
|
||||
static ExtensionModule recordExt = {
|
||||
RecordExtensionInit,
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user