diff options
author | Egbert Eich <eich@freedesktop.org> | 2004-04-15 10:13:24 +0000 |
---|---|---|
committer | Egbert Eich <eich@freedesktop.org> | 2004-04-15 10:13:24 +0000 |
commit | 08f8e56701977d8d3c5a67b22047019633ba6375 (patch) | |
tree | c18cbf09d48aaafcf00c3c86bc95148bd40d56e9 /src/xlibi18n/XlcPubI.h | |
parent | 90b6f32bbe219045cebe7927b55261d63583fa06 (diff) |
Merged changes from RELEASE-1 branchXORG-CURRENT-CLOSED
Diffstat (limited to 'src/xlibi18n/XlcPubI.h')
-rw-r--r-- | src/xlibi18n/XlcPubI.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xlibi18n/XlcPubI.h b/src/xlibi18n/XlcPubI.h index 4c65246..8441d7f 100644 --- a/src/xlibi18n/XlcPubI.h +++ b/src/xlibi18n/XlcPubI.h @@ -156,7 +156,7 @@ extern int _XwcTextPropertyToTextList( int* count_ret ); -extern int _XFree86utf8TextPropertyToTextList( +extern int _Xutf8TextPropertyToTextList( XLCd lcd, Display* dpy, const XTextProperty* text_prop, @@ -182,7 +182,7 @@ extern int _XwcTextListToTextProperty( XTextProperty* /* text_prop */ ); -extern int _XFree86utf8TextListToTextProperty( +extern int _Xutf8TextListToTextProperty( XLCd /* lcd */, Display* /* dpy */, char** /* list */, @@ -246,12 +246,12 @@ extern char *_XlcMapOSLocaleName( #endif extern int -_XFree86mbstoutf8( +_Xmbstoutf8( char *ustr, const char *str, int len); extern int -_XFree86lcmbstoutf8( +_Xlcmbstoutf8( XLCd lcd, char *ustr, const char *str, @@ -293,7 +293,7 @@ _Xlcwctomb( extern XPointer -_XFree86utf8GetConvByName( +_Utf8GetConvByName( const char *name); _XFUNCPROTOEND |