summaryrefslogtreecommitdiff
path: root/lib/localename.c
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2015-07-07 15:36:43 +0900
committerDaiki Ueno <ueno@gnu.org>2015-07-07 15:44:01 +0900
commit9b6679dcac7631a9d75adfbcfdfb9004362f3d18 (patch)
tree121bd816d136cc9d521f8c16794170d245486cdf /lib/localename.c
parentb3b5ecd02622f9d62959227641085551277dfc26 (diff)
downloadgnulib-9b6679dcac7631a9d75adfbcfdfb9004362f3d18.tar.gz
localename: fix link error on Illumos
Illumos defines __sun, but does not have getlocalename_l nor the equivalent. This partially reverts commit 387c214. * m4/localename.m4 (gl_LOCALENAME): Check if getlocalename_l is available, as well as uselocale. * lib/localename.c [HAVE_USELOCALE && __sun]: Don't fallback to use getlocalename_l if it is not available.
Diffstat (limited to 'lib/localename.c')
-rw-r--r--lib/localename.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/localename.c b/lib/localename.c
index f3733eb46c..f8cf3f2362 100644
--- a/lib/localename.c
+++ b/lib/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__