<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40199 >
Some versions of libintl.h break --disable-nls compile (maybe also: when it compiles, nls is not really disabled) Fix attached. - ML
diff -Nurd -X.diff_ignore freeciv/utility/fcintl.h freeciv/utility/fcintl.h --- freeciv/utility/fcintl.h 2007-03-05 19:13:42.000000000 +0200 +++ freeciv/utility/fcintl.h 2008-04-08 13:07:57.000000000 +0300 @@ -19,15 +19,19 @@ #endif #endif -#ifdef HAVE_LIBINTL_H -#include <libintl.h> -#endif #ifdef HAVE_LOCALE_H #include <locale.h> #endif #ifdef ENABLE_NLS +/* Include libintl.h only if nls enabled. + * It defines some wrapper macros that + * we don't want defined when nls is disabled. */ +#ifdef HAVE_LIBINTL_H +#include <libintl.h> +#endif + #define _(String) gettext(String) #define N_(String) String #define Q_(String) skip_intl_qualifier_prefix(gettext(String))
_______________________________________________ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
