diff --git a/FL/Xutf8.h b/FL/Xutf8.h index 1e26cf97d..51fc28291 100644 --- a/FL/Xutf8.h +++ b/FL/Xutf8.h @@ -142,6 +142,9 @@ long XKeysymToUcs( KeySym keysym); +#ifdef X_HAVE_UTF8_STRING +#define XUtf8LookupString Xutf8LookupString +#else int XUtf8LookupString( XIC ic, @@ -150,6 +153,7 @@ XUtf8LookupString( int bytes_buffer, KeySym* keysym, Status* status_return); +#endif unsigned short XUtf8IsNonSpacing( diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index ee2c229e5..dc7ed3388 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -407,6 +407,7 @@ XConvertEucToUtf8(const char* locale, return len; } +#ifndef X_HAVE_UTF8_STRING int XUtf8LookupString(XIC ic, XKeyPressedEvent* event, @@ -447,6 +448,7 @@ XUtf8LookupString(XIC ic, } return len; } +#endif /* X11 has utf-8 */ #endif /* X11 only */