From b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 Mon Sep 17 00:00:00 2001
From: Tomas Carnecky <tom@dbservice.com>
Date: Tue, 5 Jul 2016 08:16:09 +0200
Subject: 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>
 Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---
 nx-X11/programs/Xserver/Xext/extmod/modinit.h | 38 ++++++++++++---------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'nx-X11/programs/Xserver/Xext/extmod')

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
-- 
cgit v1.2.3