Update after gnulib changed.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 726f300b54e28fd6b9c3358f2f89358654857ed6..3ceccda930278dd0d49faa70ba9f1632fc197026 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-21  Daiki Ueno  <ueno@gnu.org>
+
+       Update after gnulib changed.
+       * lib/localcharset.c.diff: Remove file.
+
 2013-06-25  Daiki Ueno  <ueno@gnu.org>
 
        Work around localcharset issue under OS X multi-threaded scenario.

diff --git a/gnulib-local/lib/localcharset.c.diff b/gnulib-local/lib/localcharset.c.diff
deleted file mode 100644 (file)
index 088c37c..0000000
--- a/gnulib-local/lib/localcharset.c.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/localcharset.c b/localcharset.c
-index 6b0153e..bfd9a03 100644
---- a/localcharset.c
-+++ b/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 @@ locale_charset (void)
- #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
-