From bddb8c6cbe52ba9923b1d36d01f5ac9391b0ec0e Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 10 Jul 2012 02:02:52 +0100 Subject: [PATCH] Xinerama: Fix ExtensionInit prototype 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 Reviewed-by: Cyril Brulebois Reviewed-by: Jamey Sharp Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard --- 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 bb253c393..df67c009c 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -434,7 +434,7 @@ XineramaReinitData(void) */ void -PanoramiXExtensionInit(int argc, char *argv[]) +PanoramiXExtensionInit(void) { int i; Bool success = FALSE; diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 9753fe0fd..e7c744859 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -85,7 +85,7 @@ extern void SecurityExtensionInit(INITARGS); #endif #if 1 -extern void PanoramiXExtensionInit(int argc, char *argv[]); +extern void PanoramiXExtensionInit(INITARGS); #endif #if 1