merge latest (4.3.99.16) from XFree86 (vendor) branch

Xext/mitmisc.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group
@@ -38,15 +38,16 @@ in this Software without prior written authorization from The Open Group.
 #include "extnsionst.h"
 #define _MITMISC_SERVER_
 #include "mitmiscstr.h"
+#include "modinit.h"
 
 extern Bool permitOldBugs;
 
+#if 0
 static unsigned char MITReqCode;
+#endif
 
 static void MITResetProc(
-#if NeedFunctionPrototypes
     ExtensionEntry * /* extEntry */
-#endif
 );
 
 static DISPATCH_PROC(ProcMITDispatch);
@@ -57,14 +58,20 @@ static DISPATCH_PROC(SProcMITGetBugMode);
 static DISPATCH_PROC(SProcMITSetBugMode);
 
 void
-MITMiscExtensionInit()
+MITMiscExtensionInit(INITARGS)
 {
+#if 0
     ExtensionEntry *extEntry;
 
     if ((extEntry = AddExtension(MITMISCNAME, 0, 0,
 				 ProcMITDispatch, SProcMITDispatch,
 				 MITResetProc, StandardMinorOpcode)) != 0)
 	MITReqCode = (unsigned char)extEntry->base;
+#else
+    (void) AddExtension(MITMISCNAME, 0, 0,
+			ProcMITDispatch, SProcMITDispatch,
+			MITResetProc, StandardMinorOpcode);
+#endif
 }
 
 /*ARGSUSED*/