diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:52 +0100 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2012-08-01 18:04:37 -0700 |
| commit | fc13888f19cd068ee6485d5d7be54edfa17036a2 (patch) | |
| tree | aa6ee06780f2c6f27d8ec27ff7db4e725b0aa96d | |
| parent | ce106ae299a5444ee7cca1b6f4b7bc3bdfe15888 (diff) | |
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 <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>
(cherry picked from commit bddb8c6cbe52ba9923b1d36d01f5ac9391b0ec0e)
| -rw-r--r-- | Xext/panoramiX.c | 2 | ||||
| -rw-r--r-- | 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 98d327f26..3e5cd62ea 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 |