# HG changeset patch
# User Daiki Ueno <ueno@gnu.org>
# Date 1374329018 25200
# Node ID 1d151e47d4d4b14b7e9fdb3dde05ae8c218dece9
# Parent  c8b7822c1226300c5348ff3bf9f1e538428cf35d
localecharset: make locale_charset thread-safe on Mac OS X

* lib/localcharset.c (locale_charset) [DARWIN7]: Use MB_CUR_MAX_L
instead of MB_CUR_MAX.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2013-07-08  Daiki Ueno  <ueno@gnu.org>
+2013-07-20  Daiki Ueno  <ueno@gnu.org>
+
+	localecharset: make locale_charset thread-safe on Mac OS X
+	* lib/localcharset.c (locale_charset) [DARWIN7]: Use MB_CUR_MAX_L
+	instead of MB_CUR_MAX.
+
+2013-07-20  Daiki Ueno  <ueno@gnu.org>
 
 	gettext: update to version 0.18.3
 	* m4/intl.m4, m4/po.m4: Update from gettext-0.18.3.  In particular,
diff --git a/lib/localcharset.c b/lib/localcharset.c
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -65,6 +65,11 @@
 # include <os2.h>
 #endif
 
+/* For MB_CUR_MAX_L */
+#if defined DARWIN7
+# include <xlocale.h>
+#endif
+
 #if ENABLE_RELOCATABLE
 # include "relocatable.h"
 #else
@@ -545,7 +550,7 @@
 #ifdef DARWIN7
   /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8"
      (the default codeset) does not work when MB_CUR_MAX is 1.  */
-  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX <= 1)
+  if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1)
     codeset = "ASCII";
 #endif