fixup OS X compilation (for BFS-disabled) by reapply bugfix #16694

See irclogs http://www.wesnoth.org/irclogs/2014/11/%23wesnoth-dev.2014-11-08.log Conflicts: src/gettext.cpp
2014-11-08 18:04:58 -05:00 · 2014-11-08 18:04:58 -05:00 · 14b4286bea
commit 14b4286bea
parent c72417dc43
1 changed files with 6 additions and 0 deletions
--- a/src/gettext.cpp
+++ b/src/gettext.cpp
@ -24,6 +24,12 @@
 #include <windows.h>
 #endif

+#ifdef setlocale
+// Someone in libintl world decided it was a good idea to define a "setlocale" macro.
+// Note: This is necessary to compile on OS X, it fixes bug #16649
+#undef setlocale
+#endif
+
 #ifdef __APPLE__
 #include <errno.h>
 #endif