diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-07-10 10:35:50 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-07-10 10:35:50 +0900 |
| commit | 43775d2095b7abca85339b8668457a86958a88b7 (patch) | |
| tree | db8def277a280592e48796215f57a9dd8722093f /gettext-runtime | |
| parent | 0fe5072b041f783b82248bf492071f46147c4a97 (diff) | |
| download | external_gettext-43775d2095b7abca85339b8668457a86958a88b7.zip external_gettext-43775d2095b7abca85339b8668457a86958a88b7.tar.gz external_gettext-43775d2095b7abca85339b8668457a86958a88b7.tar.bz2 | |
intl: Update from gnulib
* localename.c: Update from gnulib.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl/localename.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index b7f66a2..f6206f4 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2015-07-10 Daiki Ueno <ueno@gnu.org> + + intl: Update from gnulib + * localename.c: Update from gnulib. + 2015-06-23 Daiki Ueno <ueno@gnu.org> * locale.alias: Update from glibc: diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index f3733eb..f8cf3f2 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -42,7 +42,7 @@ # if !defined IN_LIBINTL # include "glthread/lock.h" # endif -# if defined __sun +# if defined __sun && HAVE_GETLOCALENAME_L /* Solaris >= 12. */ extern char * getlocalename_l(int, locale_t); # endif @@ -2727,7 +2727,7 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) return ""; } return querylocale (mask, thread_locale); -# elif defined __sun +# elif defined __sun && HAVE_GETLOCALENAME_L /* Solaris >= 12. */ return getlocalename_l (category, thread_locale); # elif defined __ANDROID__ |