From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 10 Jul 2015 01:35:50 +0000 (+0900)
Subject: intl: Update from gnulib
X-Git-Tag: v0.19.5~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43775d2095b7abca85339b8668457a86958a88b7;p=thirdparty%2Fgettext.git

intl: Update from gnulib

* localename.c: Update from gnulib.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index b7f66a224..f6206f496 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 f3733eb46..f8cf3f236 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__