diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-06-14 18:50:39 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-06-14 18:50:39 +0000 |
| commit | 1a2d5a9e0b4c9b84ff85c30991ec70713dcfda96 (patch) | |
| tree | fb6ae3a1b8409745fd56776698999e7917f2dab6 /navit | |
| parent | c392d7bbee1190930e83cf58d57d7d0adaedddd3 (diff) | |
| download | navit-1a2d5a9e0b4c9b84ff85c30991ec70713dcfda96.tar.gz | |
Refactor:core:Rename switch ENABLE_NLS to USE_NATIVE_LANGUAGE_SUPPORT for consistency.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5537 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/intl_cmake/relocatable.c | 4 | ||||
| -rw-r--r-- | navit/main.c | 2 | ||||
| -rw-r--r-- | navit/navit_nls.c | 8 | ||||
| -rw-r--r-- | navit/support/glib/glibintl.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/navit/intl_cmake/relocatable.c b/navit/intl_cmake/relocatable.c index bf7c70854..b49446f3c 100644 --- a/navit/intl_cmake/relocatable.c +++ b/navit/intl_cmake/relocatable.c @@ -56,7 +56,7 @@ #if DEPENDS_ON_LIBICONV && HAVE_ICONV # include <iconv.h> #endif -#if DEPENDS_ON_LIBINTL && ENABLE_NLS +#if DEPENDS_ON_LIBINTL && USE_NATIVE_LANGUAGE_SUPPORT # include <libintl.h> #endif @@ -152,7 +152,7 @@ set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) #if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif -#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix +#if DEPENDS_ON_LIBINTL && USE_NATIVE_LANGUAGE_SUPPORT && defined libintl_set_relocation_prefix libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif } diff --git a/navit/main.c b/navit/main.c index d6f21c333..efb1a714a 100644 --- a/navit/main.c +++ b/navit/main.c @@ -415,7 +415,7 @@ main_init(const char *program) void main_init_nls(void) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT #ifdef FORCE_LOCALE #define STRINGIFY2(x) #x #define STRINGIFY(x) STRINGIFY2(x) diff --git a/navit/navit_nls.c b/navit/navit_nls.c index 692d3dcd3..5d4ccfbc4 100644 --- a/navit/navit_nls.c +++ b/navit/navit_nls.c @@ -12,7 +12,7 @@ static GList *textdomains; char * navit_nls_add_textdomain(const char *package, const char *dir) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT char *ret=bindtextdomain(package, dir); bind_textdomain_codeset(package, "UTF-8"); textdomains=g_list_append(textdomains, g_strdup(package)); @@ -23,7 +23,7 @@ navit_nls_add_textdomain(const char *package, const char *dir) void navit_nls_remove_textdomain(const char *package) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { if (!strcmp(i->data, package)) { @@ -39,7 +39,7 @@ navit_nls_remove_textdomain(const char *package) const char * navit_nls_gettext(const char *msgid) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { const char *ret=dgettext(i->data, msgid); @@ -54,7 +54,7 @@ navit_nls_gettext(const char *msgid) const char * navit_nls_ngettext(const char *msgid, const char *msgid_plural, unsigned long int n) { -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT GList *i=textdomains; while (i) { const char *ret=dngettext(i->data, msgid, msgid_plural, n); diff --git a/navit/support/glib/glibintl.h b/navit/support/glib/glibintl.h index fb56e4f7d..13af202c8 100644 --- a/navit/support/glib/glibintl.h +++ b/navit/support/glib/glibintl.h @@ -9,7 +9,7 @@ G_CONST_RETURN gchar *glib_gettext (const gchar *str); -#ifdef ENABLE_NLS +#ifdef USE_NATIVE_LANGUAGE_SUPPORT #include "navit_nls.h" #undef _ |