bug #216 provide better compatibility semantics in Xlib for people who are compiling or linking against older Xlibs that have XFree86's UTF-8 functions.XORG-RELEASE-1-BASE

This goes away if Sun's I18N people recommend adopting the functions and the xorg_arch list agree, but for now we have this hackery to deal with third parties who scribbled non-standard functions in our API.

1 files changed, 32 insertions, 9 deletions

diff --git a/src/xlibi18n/ICWrap.c b/src/xlibi18n/ICWrap.c
index db466a2..57a0ad5 100644
--- a/src/xlibi18n/ICWrap.c
+++ b/src/xlibi18n/ICWrap.c
@@ -391,8 +391,7 @@ XwcResetIC(ic)
 }
 
 char *
-XFree86utf8ResetIC(ic)
-    XIC ic;
+XFree86utf8ResetIC(XIC ic)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_reset)
@@ -403,6 +402,15 @@ XFree86utf8ResetIC(ic)
     return (char *)NULL;
 }
 
+#ifndef NOXFREE86COMPAT
+#undef Xutf8ResetIC
+char *
+Xutf8ResetIC(XIC ic)
+{
+    return XFree86utf8ResetIC(ic);
+}
+#endif
+
 int
 XmbLookupString(ic, ev, buffer, nbytes, keysym, status)
     XIC ic;
@@ -434,13 +442,13 @@ XwcLookupString(ic, ev, buffer, nchars, keysym, status)
 }
 
 int
-XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status)
-    XIC ic;
-    register XKeyEvent *ev;
-    char *buffer;
-    int nbytes;
-    KeySym *keysym;
-    Status *status;
+XFree86utf8LookupString(
+    XIC ic,
+    register XKeyEvent *ev,
+    char *buffer,
+    int nbytes,
+    KeySym *keysym,
+    Status *status)
 {
     if (ic->core.im) {
 	if (ic->methods->utf8_lookup_string)
@@ -452,3 +460,18 @@ XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status)
     }
     return XLookupNone;
 }
+
+#ifndef NOXFREE86COMPAT
+#undef Xutf8LookupString
+int
+Xutf8LookupString(
+    XIC ic,
+    register XKeyEvent *ev,
+    char *buffer,
+    int nbytes,
+    KeySym *keysym,
+    Status *status)
+{
+    return XFree86utf8LookupString(ic, ev, buffer, nbytes, keysym, status);
+}
+#endif