[patch] libtunepimp-0.4.0-iconv.patch

libtunepimp-0.4.0-iconv.patch (text/plain), 1.55 KB, created by solar (RETIRED) on 2006-01-27 12:00:05 UTC

diff -Nrup libtunepimp-0.4.0.orig/lib/utf8/utf8.c libtunepimp-0.4.0/lib/utf8/utf8.c
--- libtunepimp-0.4.0.orig/lib/utf8/utf8.c	2005-07-03 01:13:27 +0000
+++ libtunepimp-0.4.0/lib/utf8/utf8.c	2006-01-27 18:14:48 +0000
@@ -271,10 +271,11 @@ int utf8ToEncoding(const char *from, cha
 
 #else /* End win32. Rest is for real operating systems */
 
+#ifdef HAVE_ICONV
 int iconvert(const char *fromcode, const char *tocode,
 	     const char *from, size_t fromlen,
 	     char **to, size_t *tolen);
-
+#endif
 static char *current_charset = 0; /* means "US-ASCII" */
 
 void convert_set_charset(const char *charset)
diff -Nrup libtunepimp-0.4.0.orig/lib/utf8/utf8util.cpp libtunepimp-0.4.0/lib/utf8/utf8util.cpp
--- libtunepimp-0.4.0.orig/lib/utf8/utf8util.cpp	2005-07-10 20:01:23 +0000
+++ libtunepimp-0.4.0/lib/utf8/utf8util.cpp	2006-01-27 18:15:09 +0000
@@ -64,7 +64,7 @@ string utf8Decode(const string &from)
     return to;
 }
 
-#ifndef WIN32
+#if !defined(WIN32) && defined(HAVE_ICONV)
 extern "C"
 {
 int iconvert(const char *fromcode, const char *tocode,
@@ -75,7 +75,7 @@ int iconvert(const char *fromcode, const
 
 string utf8ToEncoding(const string &from, const string &encoding)
 {
-#ifndef WIN32
+#if !defined(WIN32) && defined(HAVE_ICONV)
     string to;
 
     if (strcasecmp(encoding.c_str(), "utf-8") == 0)
@@ -106,7 +106,7 @@ string utf8ToEncoding(const string &from
 
 string utf8FromEncoding(const string &from, const string &encoding)
 {
-#ifndef WIN32
+#if !defined(WIN32) && defined(HAVE_ICONV)
     string to;
 
     if (strcasecmp(encoding.c_str(), "utf-8") == 0)