diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-12-02 21:51:27 -0800 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:29 +0200 |
| commit | f45ac4ae31017c15ce8634be387be53b5ab8ebf3 (patch) | |
| tree | 547c15d432d7a002c337a1265e6796b83068c566 | |
| parent | 35dc4784bcee7a42a83cc1dbab13fb82cfcc5803 (diff) | |
| download | nx-libs-f45ac4ae31017c15ce8634be387be53b5ab8ebf3.tar.gz nx-libs-f45ac4ae31017c15ce8634be387be53b5ab8ebf3.tar.bz2 nx-libs-f45ac4ae31017c15ce8634be387be53b5ab8ebf3.zip | |
unifdef -UISC
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
| -rw-r--r-- | nx-X11/lib/X11/Xlib.h | 17 | ||||
| -rw-r--r-- | nx-X11/lib/X11/lcStd.c | 10 |
2 files changed, 0 insertions, 27 deletions
diff --git a/nx-X11/lib/X11/Xlib.h b/nx-X11/lib/X11/Xlib.h index 9ef4e00b0..5f2368800 100644 --- a/nx-X11/lib/X11/Xlib.h +++ b/nx-X11/lib/X11/Xlib.h @@ -59,23 +59,11 @@ typedef unsigned long wchar_t; #endif #endif -#if defined(ISC) && defined(USE_XMBTOWC) -#define wctomb(a,b) _Xwctomb(a,b) -#define mblen(a,b) _Xmblen(a,b) -#ifndef USE_XWCHAR_STRING -#define mbtowc(a,b,c) _Xmbtowc(a,b,c) -#endif -#endif extern int _Xmblen( -#ifdef ISC - char const *str, - size_t len -#else char *str, int len -#endif ); /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in @@ -4021,13 +4009,8 @@ extern void XSetAuthorization( extern int _Xmbtowc( wchar_t * /* wstr */, -#ifdef ISC - char const * /* str */, - size_t /* len */ -#else char * /* str */, int /* len */ -#endif ); extern int _Xwctomb( diff --git a/nx-X11/lib/X11/lcStd.c b/nx-X11/lib/X11/lcStd.c index 87f6b60b3..9d452bcae 100644 --- a/nx-X11/lib/X11/lcStd.c +++ b/nx-X11/lib/X11/lcStd.c @@ -199,13 +199,8 @@ _Xlcwcstombs( int _Xmbtowc( wchar_t *wstr, -#ifdef ISC - char const *str, - size_t len -#else char *str, int len -#endif ) { return _Xlcmbtowc((XLCd) NULL, wstr, str, len); @@ -213,13 +208,8 @@ _Xmbtowc( int _Xmblen( -#ifdef ISC - char const *str, - size_t len -#else char *str, int len -#endif ) { return _Xmbtowc((wchar_t *) NULL, str, len); |