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

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-27 03:36:52 +0200 (Sun, 27 Jul 2008)
New Revision: 3902

Modified:
   trunk/pingus/src/tinygettext/iconv.cpp
   trunk/pingus/src/tinygettext/iconv.hpp
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:28:31 UTC (rev 
3901)
+++ trunk/pingus/src/tinygettext/iconv.cpp      2008-07-27 01:36:52 UTC (rev 
3902)
@@ -79,11 +79,11 @@
   size_t in_size = text.size();
   size_t out_size = 4*in_size; // Worst case scenario: ASCII -> UTF-32?
   std::string result(out_size, ' ');
-  ICONV_CONST char* in_str  = &text[0];
+  const char* in_str  = &text[0];
   char* out_str = &result[0];
  
   // Try to convert the text.
-  if(iconv(m_conv, &in_str, &in_size, &out_str, &out_size) != 0) {
+  if(SDL_iconv(m_conv, &in_str, &in_size, &out_str, &out_size) != 0) {
     std::cout << "TinyGetText: text: \"" << text << "\"" << std::endl;
     std::cout << "TinyGetText: Error while converting (" 
               << from_charset << " -> " << to_charset 

Modified: trunk/pingus/src/tinygettext/iconv.hpp
===================================================================
--- trunk/pingus/src/tinygettext/iconv.hpp      2008-07-27 01:28:31 UTC (rev 
3901)
+++ trunk/pingus/src/tinygettext/iconv.hpp      2008-07-27 01:36:52 UTC (rev 
3902)
@@ -20,7 +20,7 @@
 #define HEADER_ICONV_HPP
 
 #include <string>
-#include <iconv.h>
+#include "SDL_stdinc.h"
 
 namespace TinyGetText {
 
@@ -29,7 +29,7 @@
 public:
   std::string to_charset;
   std::string from_charset;
-  iconv_t m_conv;
+  SDL_iconv_t m_conv;
 
   IConv();
   IConv(const std::string& fromcode, const std::string& tocode);