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
This commit is contained in:
parent
b6f916adf1
commit
ab87bb391f
1 changed files with 6 additions and 0 deletions
|
@ -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
|
||||
|
||||
#define DBG_G LOG_STREAM(debug, lg::general)
|
||||
#define LOG_G LOG_STREAM(info, lg::general)
|
||||
#define WRN_G LOG_STREAM(warn, lg::general)
|
||||
|
|
Loading…
Add table
Reference in a new issue