Skip to content

N
nx-libs
Commit b15fc63f authored by Tomas Carnecky's avatar Tomas Carnecky Committed by Mike Gabriel
Browse files
Options

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: 's avatarTomas Carnecky <tom@dbservice.com> Reviewed-by: 's avatarDaniel Stone <daniel@fooishbar.org> Reviewed-by: 's avatarCyril Brulebois <kibi@debian.org> Reviewed-by: 's avatarJamey Sharp <jamey@minilop.net> Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Signed-off-by: 's avatarKeith Packard <keithp@keithp.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent f0af82cb
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 67 deletions
nx-X11/programs/Xserver/GL/glxmodule.c
View file @ b15fc63f
...@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ...@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static MODULESETUPPROTO(glxSetup); static MODULESETUPPROTO(glxSetup);
extern void GlxExtensionInit(INITARGS); extern void GlxExtensionInit(void);
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
extern void InitGlxWrapInitVisuals(void (*f)(miInitVisualsProcPtr *)); extern void InitGlxWrapInitVisuals(void (*f)(miInitVisualsProcPtr *));
......
nx-X11/programs/Xserver/Xext/bigreq.c
View file @ b15fc63f
...@@ -54,7 +54,7 @@ static void BigReqResetProc( ...@@ -54,7 +54,7 @@ static void BigReqResetProc(
static DISPATCH_PROC(ProcBigReqDispatch); static DISPATCH_PROC(ProcBigReqDispatch);
void void
BigReqExtensionInit(INITARGS) BigReqExtensionInit(void)
{ {
#if 0 #if 0
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/dpms.c
View file @ b15fc63f
...@@ -76,7 +76,7 @@ static DISPATCH_PROC(SProcDPMSCapable); ...@@ -76,7 +76,7 @@ static DISPATCH_PROC(SProcDPMSCapable);
static void DPMSResetProc(ExtensionEntry* extEntry); static void DPMSResetProc(ExtensionEntry* extEntry);
void void
DPMSExtensionInit(INITARGS) DPMSExtensionInit(void)
{ {
#if 0 #if 0
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/extmod/modinit.h
View file @ b15fc63f
...@@ -5,68 +5,64 @@ ...@@ -5,68 +5,64 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifndef INITARGS
#define INITARGS void
#endif
#ifdef SHAPE #ifdef SHAPE
extern void ShapeExtensionInit(INITARGS); extern void ShapeExtensionInit(void);
#include <X11/extensions/shapeproto.h> #include <X11/extensions/shapeproto.h>
#endif #endif
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(void);
#define _XTEST_SERVER_ #define _XTEST_SERVER_
#include <nx-X11/extensions/xtestconst.h> #include <nx-X11/extensions/xtestconst.h>
#include <nx-X11/extensions/xteststr.h> #include <nx-X11/extensions/xteststr.h>
#endif #endif
#if 1 #if 1
extern void XTestExtension1Init(INITARGS); extern void XTestExtension1Init(void);
#endif #endif
#ifdef BIGREQS #ifdef BIGREQS
extern void BigReqExtensionInit(INITARGS); extern void BigReqExtensionInit(void);
#include <nx-X11/extensions/bigreqstr.h> #include <nx-X11/extensions/bigreqstr.h>
#endif #endif
#ifdef XSYNC #ifdef XSYNC
extern void SyncExtensionInit(INITARGS); extern void SyncExtensionInit(void);
#define _SYNC_SERVER #define _SYNC_SERVER
#include <nx-X11/extensions/sync.h> #include <nx-X11/extensions/sync.h>
#include <nx-X11/extensions/syncstr.h> #include <nx-X11/extensions/syncstr.h>
#endif #endif
#ifdef SCREENSAVER #ifdef SCREENSAVER
extern void ScreenSaverExtensionInit (INITARGS); extern void ScreenSaverExtensionInit (void);
#include <nx-X11/extensions/saver.h> #include <nx-X11/extensions/saver.h>
#endif #endif
#ifdef XCMISC #ifdef XCMISC
extern void XCMiscExtensionInit(INITARGS); extern void XCMiscExtensionInit(void);
#include <nx-X11/extensions/xcmiscstr.h> #include <nx-X11/extensions/xcmiscstr.h>
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(void);
#include <nx-X11/extensions/dpmsstr.h> #include <nx-X11/extensions/dpmsstr.h>
#endif #endif
#ifdef XV #ifdef XV
extern void XvExtensionInit(INITARGS); extern void XvExtensionInit(void);
extern void XvMCExtensionInit(INITARGS); extern void XvMCExtensionInit(void);
extern void XvRegister(INITARGS); extern void XvRegister(void);
#include <nx-X11/extensions/Xv.h> #include <nx-X11/extensions/Xv.h>
#include <nx-X11/extensions/XvMC.h> #include <nx-X11/extensions/XvMC.h>
#endif #endif
#ifdef RES #ifdef RES
extern void ResExtensionInit(INITARGS); extern void ResExtensionInit(void);
#include <nx-X11/extensions/XResproto.h> #include <nx-X11/extensions/XResproto.h>
#endif #endif
#ifdef SHM #ifdef SHM
extern void ShmExtensionInit(INITARGS); extern void ShmExtensionInit(void);
#include <X11/extensions/shmproto.h> #include <X11/extensions/shmproto.h>
extern void ShmSetPixmapFormat( extern void ShmSetPixmapFormat(
ScreenPtr pScreen, ScreenPtr pScreen,
...@@ -77,15 +73,15 @@ extern void ShmRegisterFuncs( ...@@ -77,15 +73,15 @@ extern void ShmRegisterFuncs(
#endif #endif
#if 1 #if 1
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(void);
#endif #endif
#if 1 #if 1
extern void XagExtensionInit(INITARGS); extern void XagExtensionInit(void);
#endif #endif
#if 1 #if 1
extern void XpExtensionInit(INITARGS); extern void XpExtensionInit(void);
#endif #endif
#if 1 #if 1
...@@ -93,5 +89,5 @@ extern void PanoramiXExtensionInit(int argc, char *argv[]); ...@@ -93,5 +89,5 @@ extern void PanoramiXExtensionInit(int argc, char *argv[]);
#endif #endif
#if 1 #if 1
extern void XkbExtensionInit(INITARGS); extern void XkbExtensionInit(void);
#endif #endif
nx-X11/programs/Xserver/Xext/saver.c
View file @ b15fc63f
...@@ -229,7 +229,7 @@ static int ScreenPrivateIndex; ...@@ -229,7 +229,7 @@ static int ScreenPrivateIndex;
****************/ ****************/
void void
ScreenSaverExtensionInit(INITARGS) ScreenSaverExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;
......
nx-X11/programs/Xserver/Xext/security.c
View file @ b15fc63f
...@@ -2147,7 +2147,7 @@ XSecurityOptions(argc, argv, i) ...@@ -2147,7 +2147,7 @@ XSecurityOptions(argc, argv, i)
*/ */
void void
SecurityExtensionInit(INITARGS) SecurityExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;
......
nx-X11/programs/Xserver/Xext/shape.c
View file @ b15fc63f
...@@ -147,7 +147,7 @@ typedef struct _ShapeEvent { ...@@ -147,7 +147,7 @@ typedef struct _ShapeEvent {
****************/ ****************/
void void
ShapeExtensionInit(INITARGS) ShapeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/shm.c
View file @ b15fc63f
...@@ -205,7 +205,7 @@ static Bool CheckForShmSyscall() ...@@ -205,7 +205,7 @@ static Bool CheckForShmSyscall()
#ifndef NXAGENT_SERVER #ifndef NXAGENT_SERVER
void void
ShmExtensionInit(INITARGS) ShmExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;
......
nx-X11/programs/Xserver/Xext/sync.c
View file @ b15fc63f
...@@ -2336,7 +2336,7 @@ SyncResetProc(extEntry) ...@@ -2336,7 +2336,7 @@ SyncResetProc(extEntry)
* ** Initialise the extension. * ** Initialise the extension.
*/ */
void void
SyncExtensionInit(INITARGS) SyncExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/xcmisc.c
View file @ b15fc63f
...@@ -68,7 +68,7 @@ static DISPATCH_PROC(SProcXCMiscGetXIDList); ...@@ -68,7 +68,7 @@ static DISPATCH_PROC(SProcXCMiscGetXIDList);
static DISPATCH_PROC(SProcXCMiscGetXIDRange); static DISPATCH_PROC(SProcXCMiscGetXIDRange);
void void
XCMiscExtensionInit(INITARGS) XCMiscExtensionInit(void)
{ {
#if 0 #if 0
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/xres.c
View file @ b15fc63f
...@@ -300,7 +300,7 @@ SProcResDispatch (ClientPtr client) ...@@ -300,7 +300,7 @@ SProcResDispatch (ClientPtr client)
} }
void void
ResExtensionInit(INITARGS) ResExtensionInit(void)
{ {
(void) AddExtension(XRES_NAME, 0, 0, (void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch, ProcResDispatch, SProcResDispatch,
......
nx-X11/programs/Xserver/Xext/xtest.c
View file @ b15fc63f
...@@ -93,7 +93,7 @@ static DISPATCH_PROC(SProcXTestGetVersion); ...@@ -93,7 +93,7 @@ static DISPATCH_PROC(SProcXTestGetVersion);
static DISPATCH_PROC(SProcXTestGrabControl); static DISPATCH_PROC(SProcXTestGrabControl);
void void
XTestExtensionInit(INITARGS) XTestExtensionInit(void)
{ {
#if 0 #if 0
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
......
nx-X11/programs/Xserver/Xext/xtest1di.c
View file @ b15fc63f
...@@ -167,7 +167,7 @@ static int XTestCurrentClientGone( ...@@ -167,7 +167,7 @@ static int XTestCurrentClientGone(
* (other than the core errors). * (other than the core errors).
*/ */
void void
XTestExtension1Init(INITARGS) XTestExtension1Init(void)
{ {
/* /*
* holds the pointer to the extension entry structure * holds the pointer to the extension entry structure
......
nx-X11/programs/Xserver/dbe/dbemodule.c
View file @ b15fc63f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
static MODULESETUPPROTO(dbeSetup); static MODULESETUPPROTO(dbeSetup);
extern void DbeExtensionInit(INITARGS); extern void DbeExtensionInit(void);
ExtensionModule dbeExt = { ExtensionModule dbeExt = {
DbeExtensionInit, DbeExtensionInit,
......
nx-X11/programs/Xserver/hw/nxagent/NXshm.c
View file @ b15fc63f
...@@ -76,7 +76,7 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth, ...@@ -76,7 +76,7 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
char *pImage); char *pImage);
void void
ShmExtensionInit(INITARGS) ShmExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
int i; int i;
......
nx-X11/programs/Xserver/mi/miinitext.c
View file @ b15fc63f
...@@ -151,7 +151,7 @@ extern Bool noXvExtension; ...@@ -151,7 +151,7 @@ extern Bool noXvExtension;
#ifndef XFree86LOADER #ifndef XFree86LOADER
#define INITARGS void #define INITARGS void
typedef void (*InitExtension)(INITARGS); typedef void (*InitExtension)(void);
#else /* XFree86Loader */ #else /* XFree86Loader */
#include "loaderProcs.h" #include "loaderProcs.h"
#endif #endif
...@@ -183,95 +183,95 @@ typedef void (*InitExtension)(INITARGS); ...@@ -183,95 +183,95 @@ typedef void (*InitExtension)(INITARGS);
/* FIXME: this whole block of externs should be from the appropriate headers */ /* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef XTESTEXT1 #ifdef XTESTEXT1
extern void XTestExtension1Init(INITARGS); extern void XTestExtension1Init(void);
#endif #endif
#ifdef SHAPE #ifdef SHAPE
extern void ShapeExtensionInit(INITARGS); extern void ShapeExtensionInit(void);
#endif #endif
#ifdef MITSHM #ifdef MITSHM
extern void ShmExtensionInit(INITARGS); extern void ShmExtensionInit(void);
#endif #endif
#ifdef PANORAMIX #ifdef PANORAMIX
extern void PanoramiXExtensionInit(INITARGS); extern void PanoramiXExtensionInit(void);
#endif #endif
#ifdef XINPUT #ifdef XINPUT
extern void XInputExtensionInit(INITARGS); extern void XInputExtensionInit(void);
#endif #endif
#ifdef XTEST #ifdef XTEST
extern void XTestExtensionInit(INITARGS); extern void XTestExtensionInit(void);
#endif #endif
#ifdef BIGREQS #ifdef BIGREQS
extern void BigReqExtensionInit(INITARGS); extern void BigReqExtensionInit(void);
#endif #endif
#ifdef XIDLE #ifdef XIDLE
extern void XIdleExtensionInit(INITARGS); extern void XIdleExtensionInit(void);
#endif #endif
#ifdef SCREENSAVER #ifdef SCREENSAVER
extern void ScreenSaverExtensionInit (INITARGS); extern void ScreenSaverExtensionInit (void);
#endif #endif
#ifdef XV #ifdef XV
extern void XvExtensionInit(INITARGS); extern void XvExtensionInit(void);
extern void XvMCExtensionInit(INITARGS); extern void XvMCExtensionInit(void);
#endif #endif
#ifdef XSYNC #ifdef XSYNC
extern void SyncExtensionInit(INITARGS); extern void SyncExtensionInit(void);
#endif #endif
#ifdef XKB #ifdef XKB
extern void XkbExtensionInit(INITARGS); extern void XkbExtensionInit(void);
#endif #endif
#ifdef XCMISC #ifdef XCMISC
extern void XCMiscExtensionInit(INITARGS); extern void XCMiscExtensionInit(void);
#endif #endif
#ifdef XRECORD #ifdef XRECORD
extern void RecordExtensionInit(INITARGS); extern void RecordExtensionInit(void);
#endif #endif
#ifdef DBE #ifdef DBE
extern void DbeExtensionInit(INITARGS); extern void DbeExtensionInit(void);
#endif #endif
#ifdef XCSECURITY #ifdef XCSECURITY
extern void SecurityExtensionInit(INITARGS); extern void SecurityExtensionInit(void);
#endif #endif
#ifdef XF86BIGFONT #ifdef XF86BIGFONT
extern void XFree86BigfontExtensionInit(INITARGS); extern void XFree86BigfontExtensionInit(void);
#endif #endif
#ifdef GLXEXT #ifdef GLXEXT
#ifndef __DARWIN__ #ifndef __DARWIN__
extern void GlxExtensionInit(INITARGS); extern void GlxExtensionInit(void);
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
#else #else
extern void DarwinGlxExtensionInit(INITARGS); extern void DarwinGlxExtensionInit(void);
extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
#endif #endif
#endif #endif
#ifdef XF86DRI #ifdef XF86DRI
extern void XFree86DRIExtensionInit(INITARGS); extern void XFree86DRIExtensionInit(void);
#endif #endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(void);
#endif #endif
#ifdef DPSEXT #ifdef DPSEXT
extern void DPSExtensionInit(INITARGS); extern void DPSExtensionInit(void);
#endif #endif
#ifdef RENDER #ifdef RENDER
extern void RenderExtensionInit(INITARGS); extern void RenderExtensionInit(void);
#endif #endif
#ifdef RANDR #ifdef RANDR
extern void RRExtensionInit(INITARGS); extern void RRExtensionInit(void);
#endif #endif
#ifdef RES #ifdef RES
extern void ResExtensionInit(INITARGS); extern void ResExtensionInit(void);
#endif #endif
#ifdef DMXEXT #ifdef DMXEXT
extern void DMXExtensionInit(INITARGS); extern void DMXExtensionInit(void);
#endif #endif
#ifdef XFIXES #ifdef XFIXES
extern void XFixesExtensionInit(INITARGS); extern void XFixesExtensionInit(void);
#endif #endif
#ifdef DAMAGE #ifdef DAMAGE
extern void DamageExtensionInit(INITARGS); extern void DamageExtensionInit(void);
#endif #endif
#ifdef COMPOSITE #ifdef COMPOSITE
extern void CompositeExtensionInit(INITARGS); extern void CompositeExtensionInit(void);
#endif #endif
/* The following is only a small first step towards run-time /* The following is only a small first step towards run-time
......
nx-X11/programs/Xserver/record/recordmod.c
View file @ b15fc63f
...@@ -10,7 +10,7 @@ extern Bool noTestExtensions; ...@@ -10,7 +10,7 @@ extern Bool noTestExtensions;
static MODULESETUPPROTO(recordSetup); static MODULESETUPPROTO(recordSetup);
extern void RecordExtensionInit(INITARGS); extern void RecordExtensionInit(void);
ExtensionModule recordExt = { ExtensionModule recordExt = {
RecordExtensionInit, RecordExtensionInit,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment