about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libio/stdio.h4
-rw-r--r--posix/unistd.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 70ce023767..774302a891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* libio/stdio.h: Remove __wur from rename and remove.
+	* posix/unistd.h: Remove __wur from dup2.
+
 2005-01-03  Andreas Jaeger  <aj@suse.de>
 
 	* elf/Makefile (tests): Revert patch from 2005-01-03.
diff --git a/libio/stdio.h b/libio/stdio.h
index 43064655b5..b8d3594dac 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -149,9 +149,9 @@ extern struct _IO_FILE *stderr;		/* Standard error output stream.  */
 
 __BEGIN_NAMESPACE_STD
 /* Remove file FILENAME.  */
-extern int remove (__const char *__filename) __THROW __wur;
+extern int remove (__const char *__filename) __THROW;
 /* Rename file OLD to NEW.  */
-extern int rename (__const char *__old, __const char *__new) __THROW __wur;
+extern int rename (__const char *__old, __const char *__new) __THROW;
 __END_NAMESPACE_STD
 
 
diff --git a/posix/unistd.h b/posix/unistd.h
index 06c8ca7c21..744c10c50b 100644
--- a/posix/unistd.h
+++ b/posix/unistd.h
@@ -468,7 +468,7 @@ extern char *getwd (char *__buf)
 extern int dup (int __fd) __THROW __wur;
 
 /* Duplicate FD to FD2, closing FD2 and making it open on the same file.  */
-extern int dup2 (int __fd, int __fd2) __THROW __wur;
+extern int dup2 (int __fd, int __fd2) __THROW;
 
 /* NULL-terminated array of "NAME=VALUE" environment variables.  */
 extern char **__environ;