2009-05-08 Kai Tietz <kai.tietz@onevision.com>

        * winduni.c (iconv_onechar): Only define when HAVE_ICONV
        is defined, but not when __CYGWIN__ or _WIN32 are defined.
        See wind_iconv_cp for call logic of this local funtion.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c2949fc3532d3e831baf633b4517f152cb844aa9..ee76d0f7704f6a38c5fb34f357d033d325e82a08 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-08  Kai Tietz  <kai.tietz@onevision.com>
+
+       * winduni.c (iconv_onechar): Only define when HAVE_ICONV
+       is defined, but not when __CYGWIN__ or _WIN32 are defined.
+       See wind_iconv_cp for call logic of this local funtion.
+
 2009-05-05  Guillaume Duhamel  <guillaume.duhamel@gmail.com>
 
        PR 10109

diff --git a/binutils/winduni.c b/binutils/winduni.c
index 1af3c39cb6440f548912d56a7b1b8580b328b405..f811de7d73256bfd9897e329607b863c7d8ba979 100644 (file)
--- a/binutils/winduni.c
+++ b/binutils/winduni.c
@@ -616,7 +616,7 @@ codepage_from_unicode (rc_uint_type *length, const unichar *unicode, char **asci
     *length = len;
 }
 
-#ifdef HAVE_ICONV
+#if defined (HAVE_ICONV) && !defined (_WIN32) && !defined (__CYGWIN__)
 static int
 iconv_onechar (iconv_t cd, ICONV_CONST char *s, char *d, int d_len, const char **n_s, char **n_d)
 {