diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-12-15 13:34:57 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-12-15 13:34:57 +0000 |
| commit | 76b02f2ec420170472b92904a98861f4b318631d (patch) | |
| tree | b79a3647a941c12aeea423c00fbbaa5b3f6a5f2c | |
| parent | 882da28ede575db21c463d156d088d41ce927bef (diff) | |
| download | navit-svn-76b02f2ec420170472b92904a98861f4b318631d.tar.gz | |
Fix:Build:Potential fix for win32 libintl.h confusion
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@3786 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | navit/navit_nls.h | 4 | ||||
| -rw-r--r-- | navit/support/glib/glibintl.h | 6 |
4 files changed, 11 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4927deb0..4d1e9c94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,6 +252,7 @@ if(WIN32 OR WINCE) endif(MSVC AND support/espeak) set(ENABLE_NLS TRUE) add_plugin(intl_cmake "windows detected" TRUE) + set(USE_LIBGNUINTL TRUE) endif() if (WIN32) set(HAVE_API_WIN32 1) diff --git a/config.h.cmake b/config.h.cmake index 5616916e..6692dbba 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -10,6 +10,7 @@ #cmakedefine CACHE_SIZE @CACHE_SIZE@ #cmakedefine AVOID_FLOAT 1 #cmakedefine AVOID_UNALIGNED 1 +#cmakedefine USE_LIBGNUINTL 1 /* Versions */ #cmakedefine PACKAGE_VERSION "@PACKAGE_VERSION@" diff --git a/navit/navit_nls.h b/navit/navit_nls.h index d6ac7fe9..560d8715 100644 --- a/navit/navit_nls.h +++ b/navit/navit_nls.h @@ -2,7 +2,11 @@ #include "config.h" #ifdef ENABLE_NLS +#ifdef USE_LIBGNUINTL +#include <libgnuintl.h> +#else #include <libintl.h> +#endif #define _(STRING) gettext(STRING) #define gettext_noop(String) String #define _n(STRING) gettext_noop(STRING) diff --git a/navit/support/glib/glibintl.h b/navit/support/glib/glibintl.h index 7899488a..fb56e4f7 100644 --- a/navit/support/glib/glibintl.h +++ b/navit/support/glib/glibintl.h @@ -11,7 +11,11 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str); #ifdef ENABLE_NLS -#include <libintl.h> +#include "navit_nls.h" +#undef _ +#undef gettext_noop +#undef _n + #define _(String) glib_gettext(String) /* Split out this in the code, but keep it in the same domain for now */ #define P_(String) glib_gettext(String) |