Update.

	* include/atomic.h: Define atomic_increment_val, atomic_decrement_val,
	and atomic_dealy is not already defined.
	* sysdeps/i386/i486/bits/atomic.h: Define atomic_delay.
	* sysdeps/x86_64/bits/atomic.h: Likewise.

	* miscd/sys/cdefs.h (__NTH): New macro.
	(__THROW): Define using nothrow attribute for C code and gcc >= 3.2.
	(__REDIRECT_NTH): New macro.
	* argp/argp.h: Use __NTH and __REDIRECT_NTH where necessary.
	* ctype/ctype.h: Likewise.
	* dirent/dirent.h: Likewise.
	* io/fcntl.h: Likewise.
	* io/sys/sendfile.h: Likewise.
	* io/sys/stat.h: Likewise.
	* io/sys/statfs.h: Likewise.
	* io/sys/statvfs.h: Likewise.
	* libio/bits/stdio.h: Likewise.
	* misc/sys/mman.h: Likewise.
	* posix/unistd.h: Likewise.
	* resource/sys/resource.h: Likewise.
	* rt/aio.h: Likewise.
	* signal/signal.h: Likewise.
	* stdlib/stdlib.h: Likewise.
	* string/argz.h: Likewise.
	* string/string.h: Likewise.
	* sysdeps/generic/inttypes.h: Likewise.
	* sysdeps/i386/fpu/bits/mathinline.h: Likewise.
	* sysdeps/powerpc/fpu/bits/mathinline.h: Likewise.
	* sysdeps/s390/fpu/bits/mathinline.h: Likewise.
	* sysdeps/x86_64/fpu/bits/mathinline.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/sys/sysmacros.h: Likewise.
	* wcsmbs/wchar.h: Likewise.

	* sysdeps/generic/glob.c: Use __PMT isntead of __P where appropriate.

	* resolv/gethnamaddr.c (getanswer): Remove __P use in variable
	definition.

	* io/sys/poll.h: Remove __THROW from poll prototype, it's a
	cancellation point.

1 files changed, 12 insertions, 12 deletions

diff --git a/dirent/dirent.h b/dirent/dirent.h
index 319fb745a1..173d0eba97 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2000, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -268,9 +268,9 @@ extern int alphasort (__const void *__e1, __const void *__e2)
      __THROW __attribute_pure__;
 # else
 #  ifdef __REDIRECT
-extern int __REDIRECT (alphasort,
-		       (__const void *__e1, __const void *__e2) __THROW,
-		       alphasort64) __attribute_pure__;
+extern int __REDIRECT_NTH (alphasort,
+			   (__const void *__e1, __const void *__e2),
+			   alphasort64) __attribute_pure__;
 #  else
 #   define alphasort alphasort64
 #  endif
@@ -288,9 +288,9 @@ extern int versionsort (__const void *__e1, __const void *__e2)
      __THROW __attribute_pure__;
 #  else
 #   ifdef __REDIRECT
-extern int __REDIRECT (versionsort,
-		       (__const void *__e1, __const void *__e2) __THROW,
-		       versionsort64) __attribute_pure__;
+extern int __REDIRECT_NTH (versionsort,
+			   (__const void *__e1, __const void *__e2),
+			   versionsort64) __attribute_pure__;
 #   else
 #    define versionsort versionsort64
 #   endif
@@ -312,11 +312,11 @@ extern __ssize_t getdirentries (int __fd, char *__restrict __buf,
 				__off_t *__restrict __basep) __THROW;
 # else
 #  ifdef __REDIRECT
-extern __ssize_t __REDIRECT (getdirentries,
-			     (int __fd, char *__restrict __buf,
-			      size_t __nbytes,
-			      __off64_t *__restrict __basep) __THROW,
-			     getdirentries64);
+extern __ssize_t __REDIRECT_NTH (getdirentries,
+				 (int __fd, char *__restrict __buf,
+				  size_t __nbytes,
+				  __off64_t *__restrict __basep),
+				 getdirentries64);
 #  else
 #   define getdirentries getdirentries64
 #  endif