Merging XORG-CURRENT into trunk

1 files changed, 3 insertions, 10 deletions

diff --git a/src/QuExt.c b/src/QuExt.c
index 5d49da07..686334e0 100644
--- a/src/QuExt.c
+++ b/src/QuExt.c
@@ -24,25 +24,18 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
+/* $XFree86$ */
 
 #define NEED_REPLIES
 #include "Xlibint.h"
 
-#if NeedFunctionPrototypes
-Bool XQueryExtension(
+Bool
+XQueryExtension(
     register Display *dpy,
     _Xconst char *name,
     int *major_opcode,  /* RETURN */
     int *first_event,   /* RETURN */
     int *first_error)	/* RETURN */
-#else
-Bool XQueryExtension(dpy, name, major_opcode, first_event, first_error)
-    register Display *dpy;
-    char *name;
-    int *major_opcode;  /* RETURN */
-    int *first_event;   /* RETURN */
-    int *first_error;	/* RETURN */
-#endif
 {       
     xQueryExtensionReply rep;
     register xQueryExtensionReq *req;