[Pingus-CVS] r3905 - trunk/pingus/src/tinygettext

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-27 03:39:41 +0200 (Sun, 27 Jul 2008)
New Revision: 3905

Modified:
   trunk/pingus/src/tinygettext/iconv.cpp
Log:
Use SDL_iconv instead of normal iconv

Modified: trunk/pingus/src/tinygettext/iconv.cpp
===================================================================
--- trunk/pingus/src/tinygettext/iconv.cpp      2008-07-27 01:38:35 UTC (rev 
3904)
+++ trunk/pingus/src/tinygettext/iconv.cpp      2008-07-27 01:39:41 UTC (rev 
3905)
@@ -36,7 +36,7 @@
     m_conv(0)
 {
   // Create the converter.
-  if(!(m_conv = iconv_open(to_charset.c_str(), from_charset.c_str())))
+  if(!(m_conv = SDL_iconv_open(to_charset.c_str(), from_charset.c_str())))
     {
       if(errno == EINVAL)
         {
@@ -65,7 +65,7 @@
   // Free, if exists.
   if(m_conv)
     {
-      iconv_close(m_conv);
+      SDL_iconv_close(m_conv);
       m_conv = 0;
     }
 }
@@ -123,7 +123,7 @@
   const char* in  = in_orig;
 
   //std::cout << "IN: " << (int)in << " " << in_len << " " << (int)out << " " 
<< out_len << std::endl;
-  int retval = iconv(cd, &in, &in_len, &out, &out_len);
+  int retval = SDL_iconv(cd, &in, &in_len, &out, &out_len);
   //std::cout << "OUT: " << (int)in << " " << in_len << " " << (int)out << " " 
<< out_len << std::endl;
 
   if (retval != 0)