diff options
| author | Daiki Ueno <ueno@gnu.org> | 2013-07-21 08:22:36 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2013-07-21 08:22:36 +0900 |
| commit | 75413c9f0fcb9041f8ce6acc2468219603cfa697 (patch) | |
| tree | 3915aea4808ce131695fb6c4fcb12e466dd3068d /gnulib-local | |
| parent | b189d06987883d8dc3194885b29ec259cdcbba13 (diff) | |
| download | external_gettext-75413c9f0fcb9041f8ce6acc2468219603cfa697.zip external_gettext-75413c9f0fcb9041f8ce6acc2468219603cfa697.tar.gz external_gettext-75413c9f0fcb9041f8ce6acc2468219603cfa697.tar.bz2 | |
Update after gnulib changed.
Diffstat (limited to 'gnulib-local')
| -rw-r--r-- | gnulib-local/ChangeLog | 5 | ||||
| -rw-r--r-- | gnulib-local/lib/localcharset.c.diff | 25 |
2 files changed, 5 insertions, 25 deletions
diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 726f300..3ceccda 100644 --- 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 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 - |