diff options
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 |