Merging XORG-CURRENT into trunk

1 files changed, 2 insertions, 12 deletions

diff --git a/src/QuTextE16.c b/src/QuTextE16.c
index 66b3149..58003f4 100644
--- a/src/QuTextE16.c
+++ b/src/QuTextE16.c
@@ -24,11 +24,12 @@ 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: xc/lib/X11/QuTextE16.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */
 
 #define NEED_REPLIES
 #include "Xlibint.h"
 
-#if NeedFunctionPrototypes
+int
 XQueryTextExtents16 (
     register Display *dpy,
     Font fid,
@@ -38,17 +39,6 @@ XQueryTextExtents16 (
     int *font_ascent,
     int *font_descent,
     register XCharStruct *overall)
-#else
-XQueryTextExtents16 (dpy, fid, string, nchars, dir, font_ascent, font_descent,
-                     overall)
-    register Display *dpy;
-    Font fid;
-    XChar2b *string;
-    register int nchars;
-    int *dir;
-    int *font_ascent, *font_descent;
-    register XCharStruct *overall;
-#endif
 {
     register long i;
     register unsigned char *ptr;