diff options
| author | Mike Frysinger <vapier@chromium.org> | 2015-10-12 18:00:43 -0400 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-10-14 15:03:32 +0900 |
| commit | afe42f6d0bbb1a8ea0134165c3b8779b2d8c94de (patch) | |
| tree | a66a1873cefea11bb7b36ee187fddcc11d624c0f /gettext-runtime | |
| parent | 614ff78da50d3b16b538c07d338dc4a9b32d6261 (diff) | |
| download | external_gettext-afe42f6d0bbb1a8ea0134165c3b8779b2d8c94de.zip external_gettext-afe42f6d0bbb1a8ea0134165c3b8779b2d8c94de.tar.gz external_gettext-afe42f6d0bbb1a8ea0134165c3b8779b2d8c94de.tar.bz2 | |
intl/localename: control langinfo.h inclusion
This header is only used to work around buggy behavior in old versions
of glibc, so do not include it all the time. Otherwise we get build
failures on systems that do not provide langinfo.h.
* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
ifdefs used in the source later on.
Diffstat (limited to 'gettext-runtime')
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 9 | ||||
| -rw-r--r-- | gettext-runtime/intl/localename.c | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 74ff1ac..10eed5d 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,12 @@ +2015-10-14 Mike Frysinger <vapier@chromium.org> + + intl/localename: control langinfo.h inclusion + This header is only used to work around buggy behavior in old + versions of glibc, so do not include it all the time. Otherwise + we get build failures on systems that do not provide langinfo.h. + * localename.c: Wrap langinfo.h include with same + ifdefs used in the source later on. + 2015-09-11 Daiki Ueno <ueno@gnu.org> * gettext 0.19.6 released. diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c index f8cf3f2..c27be86 100644 --- a/gettext-runtime/intl/localename.c +++ b/gettext-runtime/intl/localename.c @@ -38,7 +38,9 @@ # if defined __APPLE__ && defined __MACH__ # include <xlocale.h> # endif -# include <langinfo.h> +# if __GLIBC__ >= 2 && !defined __UCLIBC__ +# include <langinfo.h> +# endif # if !defined IN_LIBINTL # include "glthread/lock.h" # endif |