[Pingus-CVS] r4143 - in branches/pingus-hanusz: . src/tinygettext

[grumbel]

Author: grumbel
Date: 2011-05-12 17:05:09 +0200 (Thu, 12 May 2011)
New Revision: 4143

Modified:
   branches/pingus-hanusz/SConscript.win32
   branches/pingus-hanusz/src/tinygettext/iconv.cpp
Log:
Some more portability stuff

Modified: branches/pingus-hanusz/SConscript.win32
===================================================================
--- branches/pingus-hanusz/SConscript.win32     2011-05-12 14:42:26 UTC (rev 
4142)
+++ branches/pingus-hanusz/SConscript.win32     2011-05-12 15:05:09 UTC (rev 
4143)
@@ -1,6 +1,7 @@
 
 env = Environment(PATH="/home/ingo/projects/mingw32/run/bin:$PATH",
                   
PKG_CONFIG_LIBDIR="/home/ingo/projects/mingw32/run/lib/pkgconfig:/home/ingo/projects/mingw32/run/opt/gtk/lib/pkgconfig",
+                  CXXFLAGS=["-O2", "-s"],
                   PROGSUFFIX = '.exe',
                   CXX='i586-mingw32msvc-c++',
                   AR='i586-mingw32msvc-ar',

Modified: branches/pingus-hanusz/src/tinygettext/iconv.cpp
===================================================================
--- branches/pingus-hanusz/src/tinygettext/iconv.cpp    2011-05-12 14:42:26 UTC 
(rev 4142)
+++ branches/pingus-hanusz/src/tinygettext/iconv.cpp    2011-05-12 15:05:09 UTC 
(rev 4143)
@@ -83,7 +83,7 @@
   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.