diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-03-12 13:12:37 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-03-12 13:13:02 +0900 |
| commit | 6e9a7a6fc4d0ad7d0cfdcf56292413929bca4324 (patch) | |
| tree | ccc1efad704383b33c4077ac4a7c368640c749fc | |
| parent | f77458a7903124b2bc6b19a2ecb9d7826a2fdb1d (diff) | |
| download | external_gettext-6e9a7a6fc4d0ad7d0cfdcf56292413929bca4324.zip external_gettext-6e9a7a6fc4d0ad7d0cfdcf56292413929bca4324.tar.gz external_gettext-6e9a7a6fc4d0ad7d0cfdcf56292413929bca4324.tar.bz2 | |
intl: Update from gnulib
* gettext-runtime/intl/localename.c, gettext-runtime/intl/vasnprintf.c:
Update from gnulib.
* gettext-runtime/libasprintf/vasnprintf.c: Update from gnulib.
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl/localename.c | 11 | ||||
| -rw-r--r-- | gettext-runtime/intl/vasnprintf.c | 8 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/ChangeLog | 4 | ||||
| -rw-r--r-- | gettext-runtime/libasprintf/vasnprintf.c | 8 |
5 files changed, 27 insertions, 9 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index d32774c..3acba6e 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Daiki Ueno <ueno@gnu.org> + + intl: Update from gnulib + * localename.c, vasnprintf.c: Update from gnulib. + 2015-01-22 Daiki Ueno <ueno@gnu.org> intl: Update from gnulib diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index 815171c..f3733eb 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -42,6 +42,10 @@ # if !defined IN_LIBINTL # include "glthread/lock.h" # endif +# if defined __sun +/* Solaris >= 12. */ +extern char * getlocalename_l(int, locale_t); +# endif #endif #if HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE @@ -2584,7 +2588,7 @@ get_lcid (const char *locale_name) #endif -#if HAVE_USELOCALE /* glibc or Mac OS X */ +#if HAVE_USELOCALE /* glibc, Solaris >= 12 or Mac OS X */ /* Simple hash set of strings. We don't want to drag in lots of hash table code here. */ @@ -2723,6 +2727,11 @@ gl_locale_name_thread_unsafe (int category, const char *categoryname) return ""; } return querylocale (mask, thread_locale); +# elif defined __sun + /* Solaris >= 12. */ + return getlocalename_l (category, thread_locale); +# elif defined __ANDROID__ + return MB_CUR_MAX == 4 ? "C.UTF-8" : "C"; # endif } } diff --git a/gettext-runtime/intl/vasnprintf.c b/gettext-runtime/intl/vasnprintf.c index a97f613..fabdc17 100644 --- a/gettext-runtime/intl/vasnprintf.c +++ b/gettext-runtime/intl/vasnprintf.c @@ -1886,7 +1886,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, else { do - result[length++] = (unsigned char) *cp++; + result[length++] = *cp++; while (--n > 0); } } @@ -4793,7 +4793,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->width_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -4814,7 +4814,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->precision_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -5382,7 +5382,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, tmpsrc += count; tmpdst += count; for (n = count; n > 0; n--) - *--tmpdst = (unsigned char) *--tmpsrc; + *--tmpdst = *--tmpsrc; } } #endif diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 3eb0aed..83a193f 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,7 @@ +2015-03-12 Daiki Ueno <ueno@gnu.org> + + * vasnprintf.c: Update from gnulib. + 2015-01-22 Daiki Ueno <ueno@gnu.org> * vasnprintf.c: Update copyright year. diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c index a97f613..fabdc17 100644 --- a/gettext-runtime/libasprintf/vasnprintf.c +++ b/gettext-runtime/libasprintf/vasnprintf.c @@ -1886,7 +1886,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, else { do - result[length++] = (unsigned char) *cp++; + result[length++] = *cp++; while (--n > 0); } } @@ -4793,7 +4793,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->width_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -4814,7 +4814,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, { const FCHAR_T *mp = dp->precision_start; do - *fbp++ = (unsigned char) *mp++; + *fbp++ = *mp++; while (--n > 0); } } @@ -5382,7 +5382,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, tmpsrc += count; tmpdst += count; for (n = count; n > 0; n--) - *--tmpdst = (unsigned char) *--tmpsrc; + *--tmpdst = *--tmpsrc; } } #endif |