diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-31 04:33:54 +0000 |
| commit | 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 (patch) | |
| tree | 0fff69bdb746415afd1449a5e9afc216261fdd2e /src/xutf8 | |
| parent | 642187dc1c99cc041f181438473cda8894564c8b (diff) | |
Fix compiler warnings (STR 2988), porting from branch-1.3.
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/xutf8')
| -rw-r--r-- | src/xutf8/utf8Input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xutf8/utf8Input.c b/src/xutf8/utf8Input.c index 7e21e3f55..392483c52 100644 --- a/src/xutf8/utf8Input.c +++ b/src/xutf8/utf8Input.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdlib.h> -#if HAVE_LIBC_ICONV +#ifdef HAVE_LIBC_ICONV #include <iconv.h> #endif /* @@ -60,7 +60,7 @@ typedef struct { static int XConvertEucTwToUtf8(char* buffer_return, int len) { /* FIXME */ -#if HAVE_LIBC_ICONV +#ifdef HAVE_LIBC_ICONV iconv_t cd; int cdl; #else @@ -73,7 +73,7 @@ XConvertEucTwToUtf8(char* buffer_return, int len) { /*b = */ buf = (char*) malloc((unsigned)len); memcpy(buf, buffer_return, (unsigned) len); -#if HAVE_LIBC_ICONV +#ifdef HAVE_LIBC_ICONV l = cdl = len; cd = iconv_open("EUC-TW", "UTF-8"); iconv(cd, &b, &len, &buffer_return, &cdl); |