From 0a6be0a83f368aff7df7e1a9c567d7e16b92a579 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 31 Jan 2016 04:33:54 +0000 Subject: 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 --- src/xutf8/utf8Input.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/xutf8/utf8Input.c') 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 #include -#if HAVE_LIBC_ICONV +#ifdef HAVE_LIBC_ICONV #include #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); -- cgit v1.2.3