Ensure that <features.h> is included before __GLIBC__ is tested.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1b987e75745e88f50d8bb5c5a0ef93d9dc4bf97c..53d4011b390de1482b4ba2e76f2c720b56986b65 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-20  Bruno Haible  <bruno@clisp.org>
+
+       Ensure that <features.h> is included before __GLIBC__ is tested.
+       * printf-parse.h: Include <features.h>.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
 2010-11-20  Bruno Haible  <bruno@clisp.org>
 
        Port to uClibc.

diff --git a/gettext-runtime/intl/printf-parse.h b/gettext-runtime/intl/printf-parse.h
index 2dfd8b00fad6a6e4e082e45cd7453d71a47ba6db..12da5577ea0f9d541919d01637b870bafd254b13 100644 (file)
--- 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 <features.h> /* for __GLIBC__, __UCLIBC__ */
+#endif
+
 #include "printf-args.h"
 
 

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 0c2fcaeca3ef0c1eb799a1864f66a064363a30a3..109fbc7cbd194c03bd71e417550d2b229c067014 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-20  Bruno Haible  <bruno@clisp.org>
+
+       Ensure that <features.h> is included before __GLIBC__ is tested.
+       * printf-parse.h: Include <features.h>.
+       * configure.ac: Test for <features.h>.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
 2010-11-20  Bruno Haible  <bruno@clisp.org>
 
        Port to uClibc.

diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index 162e73ba746cdfd4cb72035a2b2965d26fc129e9..3735cd6717dd04ebcb466dc2b9a5bb8743cd22cb 100644 (file)
--- 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 2dfd8b00fad6a6e4e082e45cd7453d71a47ba6db..12da5577ea0f9d541919d01637b870bafd254b13 100644 (file)
--- 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 <features.h> /* for __GLIBC__, __UCLIBC__ */
+#endif
+
 #include "printf-args.h"
 
 

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index 5268848407e7f7a02cb24b29c2294c461e4cb48e..92962b8df03d5425909d3e0dde67d2d64852caf3 100644 (file)
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-20  Bruno Haible  <bruno@clisp.org>
+
+       Ensure that <features.h> is included before __GLIBC__ is tested.
+       * intl.m4 (AM_INTL_SUBDIR): Test for <features.h>.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
 2010-11-20  Bruno Haible  <bruno@clisp.org>
 
        Port to uClibc.

diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 4f6f3cb29fc8c23abdf21d1dfbbfccba38fefa16..96db7db08e6695780ac49e0fbc7aa7343fc9a98d 100644 (file)
--- 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])