diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 14:12:07 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 14:12:07 +0000 |
| commit | 27a69f5512a370ee8d6884eb38ccb185d8c87968 (patch) | |
| tree | 0d1dcddc3d4ba3393e2519581acf8bf6ed1c38d5 | |
| parent | adedeafd2115e1648d7c702e8f5c215040ee417d (diff) | |
fix bad merge
| -rw-r--r-- | src/xlibi18n/XlcPubI.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xlibi18n/XlcPubI.h b/src/xlibi18n/XlcPubI.h index 0a29dd48..64504eaf 100644 --- a/src/xlibi18n/XlcPubI.h +++ b/src/xlibi18n/XlcPubI.h @@ -167,7 +167,7 @@ extern int _Xutf8TextPropertyToTextList( extern int _XmbTextListToTextProperty( XLCd /* lcd */, Display* /* dpy */, - wchar_t** /* list */, + char** /* list */, int /* count */, XICCEncodingStyle /* style */, XTextProperty* /* text_prop */ @@ -176,7 +176,7 @@ extern int _XmbTextListToTextProperty( extern int _XwcTextListToTextProperty( XLCd /* lcd */, Display* /* dpy */, - char** /* list */, + wchar_t** /* list */, int /* count */, XICCEncodingStyle /* style */, XTextProperty* /* text_prop */ |