widelands-dev team mailing list archive

[Tino <tino.miegel@xxxxxxxxxxxxxx>]

Tino has proposed merging lp:~tino79/widelands/gettext018 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~tino79/widelands/gettext018/+merge/83220

After switching to gettext-0.18 i was no longer able to compile widelands withoud undefining this macro. Otherwise gcc fails on a name conflict...
-- 
https://code.launchpad.net/~tino79/widelands/gettext018/+merge/83220
Your team Widelands Developers is requested to review the proposed merge of lp:~tino79/widelands/gettext018 into lp:widelands.

=== modified file 'src/i18n.cc'
--- src/i18n.cc	2011-02-22 18:47:28 +0000
+++ src/i18n.cc	2011-11-23 20:26:28 +0000
@@ -37,6 +37,11 @@
 #define SETLOCALE std::setlocale
 #endif
 
+#ifdef setlocale 
+//undef setlocale macro to be able to compile with gettext-0.18
+#undef setlocale 
+#endif 
+
 extern int _nl_msg_cat_cntr;
 
 namespace i18n {