diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c2949fc353..ee76d0f770 100644
--- 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 1af3c39cb6..f811de7d73 100644
--- 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)
 {