aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/GL/glxmodule.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/bigreq.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/dpms.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/extmod/modinit.h38
-rw-r--r--nx-X11/programs/Xserver/Xext/saver.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/security.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/shape.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/sync.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xcmisc.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xres.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest.c2
-rw-r--r--nx-X11/programs/Xserver/Xext/xtest1di.c2
-rw-r--r--nx-X11/programs/Xserver/dbe/dbemodule.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXshm.c2
-rw-r--r--nx-X11/programs/Xserver/mi/miinitext.c62
-rw-r--r--nx-X11/programs/Xserver/record/recordmod.c2
17 files changed, 63 insertions, 67 deletions
diff --git a/nx-X11/programs/Xserver/GL/glxmodule.c b/nx-X11/programs/Xserver/GL/glxmodule.c
index b97b7ef8a..f0cce1a3f 100644
--- a/nx-X11/programs/Xserver/GL/glxmodule.c
+++ b/nx-X11/programs/Xserver/GL/glxmodule.c
@@ -43,7 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static MODULESETUPPROTO(glxSetup);
-extern void GlxExtensionInit(INITARGS);
+extern void GlxExtensionInit(void);
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
extern void InitGlxWrapInitVisuals(void (*f)(miInitVisualsProcPtr *));
diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c
index a43031d7e..ec1ece91a 100644
--- a/nx-X11/programs/Xserver/Xext/bigreq.c
+++ b/nx-X11/programs/Xserver/Xext/bigreq.c
@@ -54,7 +54,7 @@ static void BigReqResetProc(
static DISPATCH_PROC(ProcBigReqDispatch);
void
-BigReqExtensionInit(INITARGS)
+BigReqExtensionInit(void)
{
#if 0
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c
index f88e1656e..eab73ebed 100644
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -76,7 +76,7 @@ static DISPATCH_PROC(SProcDPMSCapable);
static void DPMSResetProc(ExtensionEntry* extEntry);
void
-DPMSExtensionInit(INITARGS)
+DPMSExtensionInit(void)
{
#if 0
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
index 094837d34..5242a3f1b 100644
--- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h
+++ b/nx-X11/programs/Xserver/Xext/extmod/modinit.h
@@ -5,68 +5,64 @@
#include <dix-config.h>
#endif
-#ifndef INITARGS
-#define INITARGS void
-#endif
-
#ifdef SHAPE
-extern void ShapeExtensionInit(INITARGS);
+extern void ShapeExtensionInit(void);
#include <X11/extensions/shapeproto.h>
#endif
#ifdef XTEST
-extern void XTestExtensionInit(INITARGS);
+extern void XTestExtensionInit(void);
#define _XTEST_SERVER_
#include <nx-X11/extensions/xtestconst.h>
#include <nx-X11/extensions/xteststr.h>
#endif
#if 1
-extern void XTestExtension1Init(INITARGS);
+extern void XTestExtension1Init(void);
#endif
#ifdef BIGREQS
-extern void BigReqExtensionInit(INITARGS);
+extern void BigReqExtensionInit(void);
#include <nx-X11/extensions/bigreqstr.h>
#endif
#ifdef XSYNC
-extern void SyncExtensionInit(INITARGS);
+extern void SyncExtensionInit(void);
#define _SYNC_SERVER
#include <nx-X11/extensions/sync.h>
#include <nx-X11/extensions/syncstr.h>
#endif
#ifdef SCREENSAVER
-extern void ScreenSaverExtensionInit (INITARGS);
+extern void ScreenSaverExtensionInit (void);
#include <nx-X11/extensions/saver.h>
#endif
#ifdef XCMISC
-extern void XCMiscExtensionInit(INITARGS);
+extern void XCMiscExtensionInit(void);
#include <nx-X11/extensions/xcmiscstr.h>
#endif
#ifdef DPMSExtension
-extern void DPMSExtensionInit(INITARGS);
+extern void DPMSExtensionInit(void);
#include <nx-X11/extensions/dpmsstr.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 <nx-X11/extensions/Xv.h>
#include <nx-X11/extensions/XvMC.h>
#endif
#ifdef RES
-extern void ResExtensionInit(INITARGS);
+extern void ResExtensionInit(void);
#include <nx-X11/extensions/XResproto.h>
#endif
#ifdef SHM
-extern void ShmExtensionInit(INITARGS);
+extern void ShmExtensionInit(void);
#include <X11/extensions/shmproto.h>
extern void ShmSetPixmapFormat(
ScreenPtr pScreen,
@@ -77,15 +73,15 @@ extern void ShmRegisterFuncs(
#endif
#if 1
-extern void SecurityExtensionInit(INITARGS);
+extern void SecurityExtensionInit(void);
#endif
#if 1
-extern void XagExtensionInit(INITARGS);
+extern void XagExtensionInit(void);
#endif
#if 1
-extern void XpExtensionInit(INITARGS);
+extern void XpExtensionInit(void);
#endif
#if 1
@@ -93,5 +89,5 @@ extern void PanoramiXExtensionInit(int argc, char *argv[]);
#endif
#if 1
-extern void XkbExtensionInit(INITARGS);
+extern void XkbExtensionInit(void);
#endif
diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c
index 1f78be9c8..10bb2dc2f 100644
--- a/nx-X11/programs/Xserver/Xext/saver.c
+++ b/nx-X11/programs/Xserver/Xext/saver.c
@@ -229,7 +229,7 @@ static int ScreenPrivateIndex;
****************/
void
-ScreenSaverExtensionInit(INITARGS)
+ScreenSaverExtensionInit(void)
{
ExtensionEntry *extEntry;
int i;
diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c
index 14fa1ce0e..fe741128e 100644
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -2147,7 +2147,7 @@ XSecurityOptions(argc, argv, i)
*/
void
-SecurityExtensionInit(INITARGS)
+SecurityExtensionInit(void)
{
ExtensionEntry *extEntry;
int i;
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index e48fab0f2..76d1fdd77 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -147,7 +147,7 @@ typedef struct _ShapeEvent {
****************/
void
-ShapeExtensionInit(INITARGS)
+ShapeExtensionInit(void)
{
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index 902bee7a1..b6e61de36 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -205,7 +205,7 @@ static Bool CheckForShmSyscall()
#ifndef NXAGENT_SERVER
void
-ShmExtensionInit(INITARGS)
+ShmExtensionInit(void)
{
ExtensionEntry *extEntry;
int i;
diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c
index 8899b7c17..222ef0353 100644
--- a/nx-X11/programs/Xserver/Xext/sync.c
+++ b/nx-X11/programs/Xserver/Xext/sync.c
@@ -2336,7 +2336,7 @@ SyncResetProc(extEntry)
* ** Initialise the extension.
*/
void
-SyncExtensionInit(INITARGS)
+SyncExtensionInit(void)
{
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c
index bca5bca34..447f1699c 100644
--- a/nx-X11/programs/Xserver/Xext/xcmisc.c
+++ b/nx-X11/programs/Xserver/Xext/xcmisc.c
@@ -68,7 +68,7 @@ static DISPATCH_PROC(SProcXCMiscGetXIDList);
static DISPATCH_PROC(SProcXCMiscGetXIDRange);
void
-XCMiscExtensionInit(INITARGS)
+XCMiscExtensionInit(void)
{
#if 0
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index bca7b0a18..82632a031 100644
--- a/nx-X11/programs/Xserver/Xext/xres.c
+++ b/nx-X11/programs/Xserver/Xext/xres.c
@@ -300,7 +300,7 @@ SProcResDispatch (ClientPtr client)
}
void
-ResExtensionInit(INITARGS)
+ResExtensionInit(void)
{
(void) AddExtension(XRES_NAME, 0, 0,
ProcResDispatch, SProcResDispatch,
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index 7dd668fdb..4d82f403d 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -93,7 +93,7 @@ static DISPATCH_PROC(SProcXTestGetVersion);
static DISPATCH_PROC(SProcXTestGrabControl);
void
-XTestExtensionInit(INITARGS)
+XTestExtensionInit(void)
{
#if 0
ExtensionEntry *extEntry;
diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c
index 554f336b2..4aac1824b 100644
--- a/nx-X11/programs/Xserver/Xext/xtest1di.c
+++ b/nx-X11/programs/Xserver/Xext/xtest1di.c
@@ -167,7 +167,7 @@ static int XTestCurrentClientGone(
* (other than the core errors).
*/
void
-XTestExtension1Init(INITARGS)
+XTestExtension1Init(void)
{
/*
* holds the pointer to the extension entry structure
diff --git a/nx-X11/programs/Xserver/dbe/dbemodule.c b/nx-X11/programs/Xserver/dbe/dbemodule.c
index 9a05f4071..bdb7f3345 100644
--- a/nx-X11/programs/Xserver/dbe/dbemodule.c
+++ b/nx-X11/programs/Xserver/dbe/dbemodule.c
@@ -9,7 +9,7 @@
static MODULESETUPPROTO(dbeSetup);
-extern void DbeExtensionInit(INITARGS);
+extern void DbeExtensionInit(void);
ExtensionModule dbeExt = {
DbeExtensionInit,
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
index 86b9e0d24..28b42d676 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXshm.c
@@ -76,7 +76,7 @@ extern void fbPutImage (DrawablePtr pDrawable, GCPtr pGC, int depth,
char *pImage);
void
-ShmExtensionInit(INITARGS)
+ShmExtensionInit(void)
{
ExtensionEntry *extEntry;
int i;
diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c
index dcd91c5e0..1b947a784 100644
--- a/nx-X11/programs/Xserver/mi/miinitext.c
+++ b/nx-X11/programs/Xserver/mi/miinitext.c
@@ -151,7 +151,7 @@ extern Bool noXvExtension;
#ifndef XFree86LOADER
#define INITARGS void
-typedef void (*InitExtension)(INITARGS);
+typedef void (*InitExtension)(void);
#else /* XFree86Loader */
#include "loaderProcs.h"
#endif
@@ -183,95 +183,95 @@ typedef void (*InitExtension)(INITARGS);
/* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef XTESTEXT1
-extern void XTestExtension1Init(INITARGS);
+extern void XTestExtension1Init(void);
#endif
#ifdef SHAPE
-extern void ShapeExtensionInit(INITARGS);
+extern void ShapeExtensionInit(void);
#endif
#ifdef MITSHM
-extern void ShmExtensionInit(INITARGS);
+extern void ShmExtensionInit(void);
#endif
#ifdef PANORAMIX
-extern void PanoramiXExtensionInit(INITARGS);
+extern void PanoramiXExtensionInit(void);
#endif
#ifdef XINPUT
-extern void XInputExtensionInit(INITARGS);
+extern void XInputExtensionInit(void);
#endif
#ifdef XTEST
-extern void XTestExtensionInit(INITARGS);
+extern void XTestExtensionInit(void);
#endif
#ifdef BIGREQS
-extern void BigReqExtensionInit(INITARGS);
+extern void BigReqExtensionInit(void);
#endif
#ifdef XIDLE
-extern void XIdleExtensionInit(INITARGS);
+extern void XIdleExtensionInit(void);
#endif
#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
#ifdef XSYNC
-extern void SyncExtensionInit(INITARGS);
+extern void SyncExtensionInit(void);
#endif
#ifdef XKB
-extern void XkbExtensionInit(INITARGS);
+extern void XkbExtensionInit(void);
#endif
#ifdef XCMISC
-extern void XCMiscExtensionInit(INITARGS);
+extern void XCMiscExtensionInit(void);
#endif
#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 XF86BIGFONT
-extern void XFree86BigfontExtensionInit(INITARGS);
+extern void XFree86BigfontExtensionInit(void);
#endif
#ifdef GLXEXT
#ifndef __DARWIN__
-extern void GlxExtensionInit(INITARGS);
+extern void GlxExtensionInit(void);
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
#else
-extern void DarwinGlxExtensionInit(INITARGS);
+extern void DarwinGlxExtensionInit(void);
extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *);
#endif
#endif
#ifdef XF86DRI
-extern void XFree86DRIExtensionInit(INITARGS);
+extern void XFree86DRIExtensionInit(void);
#endif
#ifdef DPMSExtension
-extern void DPMSExtensionInit(INITARGS);
+extern void DPMSExtensionInit(void);
#endif
#ifdef DPSEXT
-extern void DPSExtensionInit(INITARGS);
+extern void DPSExtensionInit(void);
#endif
#ifdef RENDER
-extern void RenderExtensionInit(INITARGS);
+extern void RenderExtensionInit(void);
#endif
#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
diff --git a/nx-X11/programs/Xserver/record/recordmod.c b/nx-X11/programs/Xserver/record/recordmod.c
index 5a74f0f1a..b216d7f52 100644
--- a/nx-X11/programs/Xserver/record/recordmod.c
+++ b/nx-X11/programs/Xserver/record/recordmod.c
@@ -10,7 +10,7 @@ extern Bool noTestExtensions;
static MODULESETUPPROTO(recordSetup);
-extern void RecordExtensionInit(INITARGS);
+extern void RecordExtensionInit(void);
ExtensionModule recordExt = {
RecordExtensionInit,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:21:28 +0000