diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 13:47:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-29 13:47:01 +0000 |
| commit | 06e5c90504a3b702b24ec70073d52027de4b5c2b (patch) | |
| tree | 29fa8ebc5b9f2e8d63eaa331f66d2e1c0f45c7c2 | |
| parent | 12e9abcfd02d073421ed3a8bd77e4a824b04f914 (diff) | |
| download | xorg-lib-libX11-06e5c90504a3b702b24ec70073d52027de4b5c2b.tar.gz | |
fix bad merge
| -rw-r--r-- | modules/im/ximcp/imLcPrs.c | 8 | ||||
| -rw-r--r-- | src/xlibi18n/mbWrap.c | 11 | ||||
| -rw-r--r-- | src/xlibi18n/wcWrap.c | 11 |
3 files changed, 0 insertions, 30 deletions
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c index 21a29826..f00d0741 100644 --- a/modules/im/ximcp/imLcPrs.c +++ b/modules/im/ximcp/imLcPrs.c @@ -53,14 +53,6 @@ extern int _Xmbstoutf8( int len ); -extern int _Xmbstoutf8( -#if NeedFunctionPrototypes - char *ustr, - const char *str, - int len -#endif -); - /* * Parsing File Format: * diff --git a/src/xlibi18n/mbWrap.c b/src/xlibi18n/mbWrap.c index c9868961..07099f7a 100644 --- a/src/xlibi18n/mbWrap.c +++ b/src/xlibi18n/mbWrap.c @@ -55,17 +55,6 @@ from The Open Group. #include "Xlibint.h" #include "Xlcint.h" -#if NeedFunctionPrototypes -void -XmbDrawText( - Display *dpy, - Drawable d, - GC gc, - int x, - int y, - XmbTextItem *text_items, - int nitems) -#else void XmbDrawText( Display *dpy, diff --git a/src/xlibi18n/wcWrap.c b/src/xlibi18n/wcWrap.c index 23ebd904..6d8f1aad 100644 --- a/src/xlibi18n/wcWrap.c +++ b/src/xlibi18n/wcWrap.c @@ -56,17 +56,6 @@ from The Open Group. #include "Xlibint.h" #include "Xlcint.h" -#if NeedFunctionPrototypes -void -XwcDrawText( - Display *dpy, - Drawable d, - GC gc, - int x, - int y, - XwcTextItem *text_items, - int nitems) -#else void XwcDrawText( Display *dpy, |