12 files changed, 16 insertions, 7 deletions
diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 681ea70..9207d52 100644
--- a/sysdeps/alpha/fpu/bits/mathinline.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
@@ -75,7 +75,7 @@ __inline_copysign(copysign, double)
 #undef __MATH_INLINE_copysign
 
 
-#if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8))
+#if __GNUC_PREREQ (2, 8)
 __MATH_INLINE float __fabsf (float __x) { return __builtin_fabsf (__x); }
 __MATH_INLINE float fabsf (float __x) { return __builtin_fabsf (__x); }
 __MATH_INLINE double __fabs (double __x) { return __builtin_fabs (__x); }
diff --git a/sysdeps/generic/morecore.c b/sysdeps/generic/morecore.c
index 1e374da..5e1ac58 100644
--- a/sysdeps/generic/morecore.c
+++ b/sysdeps/generic/morecore.c
@@ -30,7 +30,7 @@
    systems with potentially hostile include files.  */
 
 #include <stddef.h>
-extern __ptr_t __sbrk __P ((ptrdiff_t increment));
+extern __malloc_ptr_t __sbrk __P ((ptrdiff_t increment));
 #endif
 
 #ifndef NULL
@@ -40,12 +40,12 @@ extern __ptr_t __sbrk __P ((ptrdiff_t increment));
 /* Allocate INCREMENT more bytes of data space,
    and return the start of data space, or NULL on errors.
    If INCREMENT is negative, shrink data space.  */
-__ptr_t
+__malloc_ptr_t
 __default_morecore (increment)
      __malloc_ptrdiff_t increment;
 {
-  __ptr_t result = (__ptr_t) __sbrk (increment);
-  if (result == (__ptr_t) -1)
+  __malloc_ptr_t result = (__malloc_ptr_t) __sbrk (increment);
+  if (result == (__malloc_ptr_t) -1)
     return NULL;
   return result;
 }
diff --git a/sysdeps/gnu/errlist.awk b/sysdeps/gnu/errlist.awk
index 0616b03..3b2bd0d 100644
--- a/sysdeps/gnu/errlist.awk
+++ b/sysdeps/gnu/errlist.awk
@@ -40,6 +40,7 @@ BEGIN {
     print "/* This file is generated from errno.texi by errlist.awk.  */"
     print "";
     print "#include <errno.h>";
+    print "#include <libintl.h>";
     print "";
     print "#ifndef SYS_ERRLIST";
     print "# define SYS_ERRLIST _sys_errlist";
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index c718773..4c635d2 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -1,6 +1,7 @@
 /* This file is generated from errno.texi by errlist.awk.  */
 
 #include <errno.h>
+#include <libintl.h>
 
 #ifndef SYS_ERRLIST
 # define SYS_ERRLIST _sys_errlist
diff --git a/sysdeps/i386/fpu/bits/mathinline.h b/sysdeps/i386/fpu/bits/mathinline.h
index 8fb22d4..00fe3c0 100644
--- a/sysdeps/i386/fpu/bits/mathinline.h
+++ b/sysdeps/i386/fpu/bits/mathinline.h
@@ -138,7 +138,7 @@ __signbitl (long double __x)
 
 /* The gcc, version 2.7 or below, has problems with all this inlining
    code.  So disable it for this version of the compiler.  */
-#if defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7))
+#if __GNUC_PREREQ (2, 8)
 
 #if ((!defined __NO_MATH_INLINES || defined __LIBC_INTERNAL_MATH_INLINES) \
      && defined __OPTIMIZE__)
@@ -426,7 +426,7 @@ __inline_mathcode2 (pow, __x, __y, \
 __inline_mathop (sqrt, "fsqrt")
 __inline_mathop_ (long double, __sqrtl, "fsqrt")
 
-#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+#if __GNUC_PREREQ (2, 8)
 __inline_mathcode_ (double, fabs, __x, return __builtin_fabs (__x))
 __inline_mathcode_ (float, fabsf, __x, return __builtin_fabsf (__x))
 __inline_mathcode_ (long double, fabsl, __x, return __builtin_fabsl (__x))
diff --git a/sysdeps/mach/hurd/mips/dl-machine.c b/sysdeps/mach/hurd/mips/dl-machine.c
index 18261e1..e4955e4 100644
--- a/sysdeps/mach/hurd/mips/dl-machine.c
+++ b/sysdeps/mach/hurd/mips/dl-machine.c
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <sys/stat.h>
+#include <libintl.h>
 
 void weak_function
 abort (void)
diff --git a/sysdeps/posix/gai_strerror.c b/sysdeps/posix/gai_strerror.c
index f5b33cb..490cd5b 100644
--- a/sysdeps/posix/gai_strerror.c
+++ b/sysdeps/posix/gai_strerror.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <netdb.h>
+#include <libintl.h>
 
 static struct
   {
diff --git a/sysdeps/unix/make_errlist.c b/sysdeps/unix/make_errlist.c
index 4d93a5d..b73b152 100644
--- a/sysdeps/unix/make_errlist.c
+++ b/sysdeps/unix/make_errlist.c
@@ -58,6 +58,7 @@ main ()
    Boston, MA 02111-1307, USA.  */\n\n", year);
 
   puts ("#include <stddef.h>\n");
+  puts ("#include <libintl.h>\n");
   puts ("\n/* This is a list of all known `errno' codes.  */\n");
 
   printf ("\nconst int _sys_nerr = %d;\n\n", sys_nerr);
diff --git a/sysdeps/unix/siglist.c b/sysdeps/unix/siglist.c
index 942f764..3913c53 100644
--- a/sysdeps/unix/siglist.c
+++ b/sysdeps/unix/siglist.c
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
+#include <libintl.h>
 
 /* This is a list of all known signal numbers.  */
 
diff --git a/sysdeps/unix/sysv/linux/arm/siglist.c b/sysdeps/unix/sysv/linux/arm/siglist.c
index 9a53960..5d3a9af 100644
--- a/sysdeps/unix/sysv/linux/arm/siglist.c
+++ b/sysdeps/unix/sysv/linux/arm/siglist.c
@@ -19,6 +19,7 @@
 #include <stddef.h>
 #include <signal.h>
 #include <sizes.h>
+#include <libintl.h>
 
 #if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
 # define SYS_SIGLIST	__new_sys_siglist
diff --git a/sysdeps/unix/sysv/linux/siglist.c b/sysdeps/unix/sysv/linux/siglist.c
index d14a1b9..30d2a4a 100644
--- a/sysdeps/unix/sysv/linux/siglist.c
+++ b/sysdeps/unix/sysv/linux/siglist.c
@@ -19,6 +19,7 @@
 #include <stddef.h>
 #include <signal.h>
 #include <sizes.h>
+#include <libintl.h>
 
 #if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
 # define SYS_SIGLIST	__new_sys_siglist
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c b/sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c
index 5d642e4..fd8a503 100644
--- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c
+++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>
+#include <libintl.h>
 
 
 /* This is a list of all known `errno' codes.  */