merge latest (4.3.99.16) from XFree86 (vendor) branch

include/extension.h

@@ -45,39 +45,22 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extension.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
 
 #ifndef EXTENSION_H
 #define EXTENSION_H 
 
 _XFUNCPROTOBEGIN
 
-extern unsigned short StandardMinorOpcode(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern unsigned short StandardMinorOpcode(ClientPtr /*client*/);
 
-extern unsigned short MinorOpcodeOfRequest(
-#if NeedFunctionPrototypes
-    ClientPtr /*client*/
-#endif
-);
+extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
 
-extern void InitExtensions(
-#if NeedFunctionPrototypes
-    int argc,
-    char **argv
-#endif
-);
+extern void InitExtensions(int argc, char **argv);
 
 extern void InitVisualWrap(void);
 
-extern void CloseDownExtensions(
-#if NeedFunctionPrototypes
-    void
-#endif
-);
+extern void CloseDownExtensions(void);
 
 _XFUNCPROTOEND