1 files changed, 23 insertions, 46 deletions

diff --git a/modules/om/generic/omTextEsc.c b/modules/om/generic/omTextEsc.c
index ad262ef2..84ccbf3a 100644
--- a/modules/om/generic/omTextEsc.c
+++ b/modules/om/generic/omTextEsc.c
@@ -23,7 +23,7 @@
  * Author: Katsuhisa Yano	TOSHIBA Corp.
  *			   	mopi@osa.ilab.toshiba.co.jp
  */
-/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.5 2001/01/17 19:41:56 dawes Exp $ */
+/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */
 /*
  * Copyright 1995 by FUJITSU LIMITED
  * This is source code modified by FUJITSU LIMITED under the Joint
@@ -41,9 +41,9 @@
 #define	FONTSCOPE	2
 
 static int
-is_rotate(oc, font)
-    XOC         oc;
-    XFontStruct *font;
+is_rotate(
+    XOC         oc,
+    XFontStruct *font)
 {
     XOCGenericPart      *gen = XOC_GENERIC(oc);
     FontSet             font_set;
@@ -66,9 +66,9 @@ is_rotate(oc, font)
 }
 
 static int
-is_codemap(oc, font)
-    XOC         oc;
-    XFontStruct *font;
+is_codemap(
+    XOC         oc,
+    XFontStruct *font)
 {
     XOCGenericPart      *gen = XOC_GENERIC(oc);
     FontSet             font_set;
@@ -91,12 +91,12 @@ is_codemap(oc, font)
 }
 
 static int
-escapement_vertical(oc, font, is_xchar2b, text, length)
-    XOC         oc;
-    XFontStruct *font;
-    Bool        is_xchar2b;
-    XPointer    text;
-    int         length;
+escapement_vertical(
+    XOC         oc,
+    XFontStruct *font,
+    Bool        is_xchar2b,
+    XPointer    text,
+    int         length)
 {
     XChar2b	*buf2b;
     char	*buf;
@@ -125,14 +125,12 @@ escapement_vertical(oc, font, is_xchar2b, text, length)
 }
 
 
-extern FontData _XomGetFontDataFromFontSet();
-
 static int
-TextWidthWithFontSet(font_set, oc, text, length)
-    FontSet	font_set;
-    XOC		oc;
-    XPointer    text;
-    int         length;
+TextWidthWithFontSet(
+    FontSet	font_set,
+    XOC		oc,
+    XPointer    text,
+    int         length)
 {
     FontData		fd;
     XFontStruct		*font;
@@ -238,11 +236,11 @@ TextWidthWithFontSet(font_set, oc, text, length)
 /* For VW/UDC end */
 
 static int
-_XomGenericTextEscapement(oc, type, text, length)
-    XOC oc;
-    XOMTextType type;
-    XPointer text;
-    int length;
+_XomGenericTextEscapement(
+    XOC oc,
+    XOMTextType type,
+    XPointer text,
+    int length)
 {
     XlcConv conv;
     XFontStruct *font;
@@ -282,40 +280,19 @@ _XomGenericTextEscapement(oc, type, text, length)
 }
 
 int
-#if NeedFunctionPrototypes
 _XmbGenericTextEscapement(XOC oc, _Xconst char *text, int length)
-#else
-_XmbGenericTextEscapement(oc, text, length)
-    XOC oc;
-    _Xconst char *text;
-    int length;
-#endif
 {
     return _XomGenericTextEscapement(oc, XOMMultiByte, (XPointer) text, length);
 }
 
 int
-#if NeedFunctionPrototypes
 _XwcGenericTextEscapement(XOC oc, _Xconst wchar_t *text, int length)
-#else
-_XwcGenericTextEscapement(oc, text, length)
-    XOC oc;
-    _Xconst wchar_t *text;
-    int length;
-#endif
 {
     return _XomGenericTextEscapement(oc, XOMWideChar, (XPointer) text, length);
 }
 
 int
-#if NeedFunctionPrototypes
 _Xutf8GenericTextEscapement(XOC oc, _Xconst char *text, int length)
-#else
-_Xutf8GenericTextEscapement(oc, text, length)
-    XOC oc;
-    _Xconst char *text;
-    int length;
-#endif
 {
     return _XomGenericTextEscapement(oc, XOMUtf8String, (XPointer) text,
 				     length);