about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/errno.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9895ffbdab..55934388b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/errno.h (__set_errno): Define as errno = val
+	unconditionally.
+
 2002-11-24  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/posix/readv.c: Include <errno.h>, use __set_errno macro.
diff --git a/include/errno.h b/include/errno.h
index 1663538661..05888c1363 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -16,7 +16,6 @@
 #  undef  errno
 #  define errno errno		/* For #ifndef errno tests.  */
 extern int errno attribute_hidden;
-#  define __set_errno(val) (errno = (val))
 
 # else
 
@@ -30,13 +29,12 @@ extern int errno attribute_hidden;
 #    define errno errno		/* For #ifndef errno tests.  */
 #   endif
 extern __thread int errno attribute_tls_model_ie;
-#   define __set_errno(val) (errno = (val))
-#  else
-#   define __set_errno(val) (*__errno_location ()) = (val)
 #  endif
 
 # endif	/* RTLD_PRIVATE_ERRNO */
 
+# define __set_errno(val) (errno = (val))
+
 #endif /* _ERRNO_H */
 
 #endif /* ! _ERRNO_H */