summaryrefslogtreecommitdiffstats
path: root/newlib/libc/iconv/lib/local.h
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2009-12-17 20:04:43 +0000
committerJeff Johnston <jjohnstn@redhat.com>2009-12-17 20:04:43 +0000
commitbbe9636fd8db2af188f6e20bacd31225301b0aa6 (patch)
tree78b2a7409378c603e65b8cbbfcdeeaef00fb268e /newlib/libc/iconv/lib/local.h
parent8b917fbcdd82d165f1c9908d014696543767b34c (diff)
downloadcygnal-bbe9636fd8db2af188f6e20bacd31225301b0aa6.tar.gz
cygnal-bbe9636fd8db2af188f6e20bacd31225301b0aa6.tar.bz2
cygnal-bbe9636fd8db2af188f6e20bacd31225301b0aa6.zip
2009-12-17 Jerker Back <jerker.back@gmail.com>
* libc/iconv/lib/local.h[!__GNUC__]: Add alternative version of ICONV_ZERO_MB_STATE_T macro. * libc/iconv/lib/ucsconv.c (ucs_based_conversion_get_state): Use temporary local variable nullstate to hold empty mbstate_t.
Diffstat (limited to 'newlib/libc/iconv/lib/local.h')
-rw-r--r--newlib/libc/iconv/lib/local.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
index 85f22634c..fd386c5fb 100644
--- a/newlib/libc/iconv/lib/local.h
+++ b/newlib/libc/iconv/lib/local.h
@@ -41,7 +41,11 @@
#define ICONV_DATA_EXT ".cct"
/* This macro is used to zero mbstate_t objects */
+#ifdef __GNUC__
#define ICONV_ZERO_MB_STATE_T ((mbstate_t){0, {0}})
+#else
+#define ICONV_ZERO_MB_STATE_T {0}
+#endif
/* Define the maximum multi-byte character length produced by iconv library */
#if MB_LEN_MAX < 6