[PATCH 04/42] Xinerama: Fix ExtensionInit prototype

Daniel Stone daniel at fooishbar.org
Fri Dec 2 03:27:12 PST 2011


Huh, so I guess INITARGS used to be int argc, char *argv then.  Either
way, it's now void, so fix that ...

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi at debian.org>
Reviewed-by: Jamey Sharp <jamey at minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Xext/panoramiX.c                    |    2 +-
 hw/xfree86/dixmods/extmod/modinit.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index fae7c81..7c2f04d 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -438,7 +438,7 @@ void XineramaReinitData(void)
  *		Initialize global variables.
  */ 
 
-void PanoramiXExtensionInit(int argc, char *argv[])
+void PanoramiXExtensionInit(void)
 {
     int 	     	i;
     Bool	     	success = FALSE;
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 5bbbb88..adbcdd5 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -78,7 +78,7 @@ extern void SecurityExtensionInit(INITARGS);
 #endif
 
 #if 1
-extern void PanoramiXExtensionInit(int argc, char *argv[]);
+extern void PanoramiXExtensionInit(INITARGS);
 #endif
 
 #if 1
-- 
1.7.7.3



More information about the xorg-devel mailing list