xserver: Branch 'master'

[Greg Kroah-Hartman]

 Xext/shape.c                        |    2 +-
 hw/xfree86/dixmods/extmod/modinit.h |    1 -
 include/window.h                    |    2 ++
 mi/miinitext.c                      |    3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

New commits:
diff-tree 96c19a3ec1b7e43782d373b8015fa0ca24cb4f5b (from 576e6fb1124a47493371210adf99d6f2076e72c5)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Fri Jun 9 09:51:28 2006 -0700

    put function prototype for ShapeExtensionInit() in proper place
    
    based on FIXME in mi/miinitext.c

diff --git a/Xext/shape.c b/Xext/shape.c
index c5bb4e3..9f46a79 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -146,7 +146,7 @@ typedef struct _ShapeEvent {
  ****************/
 
 void
-ShapeExtensionInit(INITARGS)
+ShapeExtensionInit(void)
 {
     ExtensionEntry *extEntry;
 
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 3e185e4..4f7a23e 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -10,7 +10,6 @@
 #endif
 
 #ifdef SHAPE
-extern void ShapeExtensionInit(INITARGS);
 #define _SHAPE_SERVER_  /* don't want Xlib structures */
 #include <X11/extensions/shapestr.h>
 #endif
diff --git a/include/window.h b/include/window.h
index 0aeca6e..6464f1b 100644
--- a/include/window.h
+++ b/include/window.h
@@ -256,6 +256,8 @@ void ResizeChildrenWinSize(
     int /*dw*/,
     int /*dh*/);
 
+extern void ShapeExtensionInit(void);
+
 extern void SendShapeNotify(
     WindowPtr /* pWin */,
     int /* which */ );
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 170efed..091ac6b 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -258,9 +258,6 @@ typedef void (*InitExtension)(INITARGS);
 #endif
 
 /* FIXME: this whole block of externs should be from the appropriate headers */
-#ifdef SHAPE
-extern void ShapeExtensionInit(INITARGS);
-#endif
 #ifdef EVI
 extern void EVIExtensionInit(INITARGS);
 #endif