Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gettext.h: include <locale> before defining the gettext macro (#4452) 

Fixes #4446: a syntax error that happens if something else (such as
<iomanip> or <locale> in certain libstdc++ versions) includes
<libintl.h> later, which contains a function declaration for gettext
that gets mangled by the macro.

See the added comment in gettext.h and the discussion in #4446/#4452
for details.
master
kahrl 2016-08-21 02:40:23 +02:00 committed by est31
parent f092dac979
commit cafa400fa5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gettext.h
View File

@ -25,6 +25,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#if USE_GETTEXT #if USE_GETTEXT
#include <libintl.h> #include <libintl.h>
#else #else
// In certain environments, some standard headers like <iomanip>
// and <locale> include libintl.h. If libintl.h is included after
// we define our gettext macro below, this causes a syntax error
// at the declaration of the gettext function in libintl.h.
// Fix this by including such a header before defining the macro.
// See issue #4446.
// Note that we can't include libintl.h directly since we're in
// the USE_GETTEXT=0 case and can't assume that gettext is installed.
#include <locale>
#define gettext(String) String #define gettext(String) String
#endif #endif