From: Bruno Haible Date: Sat, 20 Nov 2010 23:09:15 +0000 (+0100) Subject: Ensure that is included before __GLIBC__ is tested. X-Git-Tag: v0.18.2~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcf60b8042fa8826ccfb183ff3c1643bdb4df316;p=thirdparty%2Fgettext.git Ensure that is included before __GLIBC__ is tested. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 1b987e757..53d4011b3 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2010-11-20 Bruno Haible + + Ensure that is included before __GLIBC__ is tested. + * printf-parse.h: Include . + Reported by Mike Frysinger . + 2010-11-20 Bruno Haible Port to uClibc. diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h index 2dfd8b00f..12da5577e 100644 --- a/gettext-runtime/intl/printf-parse.h +++ b/gettext-runtime/intl/printf-parse.h @@ -19,6 +19,10 @@ #ifndef _PRINTF_PARSE_H #define _PRINTF_PARSE_H +#if HAVE_FEATURES_H +# include /* for __GLIBC__, __UCLIBC__ */ +#endif + #include "printf-args.h" diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 0c2fcaeca..109fbc7cb 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,10 @@ +2010-11-20 Bruno Haible + + Ensure that is included before __GLIBC__ is tested. + * printf-parse.h: Include . + * configure.ac: Test for . + Reported by Mike Frysinger . + 2010-11-20 Bruno Haible Port to uClibc. diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac index 162e73ba7..3735cd671 100644 --- a/gettext-runtime/libasprintf/configure.ac +++ b/gettext-runtime/libasprintf/configure.ac @@ -1,5 +1,5 @@ dnl Configuration for the GNU libasprintf library -dnl Copyright (C) 2002-2009 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2010 Free Software Foundation, Inc. dnl dnl This program is free software: you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -52,6 +52,7 @@ AC_SUBST([LTNOUNDEF]) dnl Checks for libraries. dnl Checks for header files. +AC_CHECK_HEADERS([features.h]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/gettext-runtime/libasprintf/printf-parse.h b/gettext-runtime/libasprintf/printf-parse.h index 2dfd8b00f..12da5577e 100644 --- a/gettext-runtime/libasprintf/printf-parse.h +++ b/gettext-runtime/libasprintf/printf-parse.h @@ -19,6 +19,10 @@ #ifndef _PRINTF_PARSE_H #define _PRINTF_PARSE_H +#if HAVE_FEATURES_H +# include /* for __GLIBC__, __UCLIBC__ */ +#endif + #include "printf-args.h" diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 526884840..92962b8df 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2010-11-20 Bruno Haible + + Ensure that is included before __GLIBC__ is tested. + * intl.m4 (AM_INTL_SUBDIR): Test for . + Reported by Mike Frysinger . + 2010-11-20 Bruno Haible Port to uClibc. diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4 index 4f6f3cb29..96db7db08 100644 --- a/gettext-runtime/m4/intl.m4 +++ b/gettext-runtime/m4/intl.m4 @@ -1,4 +1,4 @@ -# intl.m4 serial 19 (gettext-0.18.2) +# intl.m4 serial 20 (gettext-0.18.2) dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -55,7 +55,7 @@ AC_DEFUN([AM_INTL_SUBDIR], [AC_DEFINE([ptrdiff_t], [long], [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) + AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h]) AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \ snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])