aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-01-15 23:04:20 +0000
committerUlrich Drepper <drepper@redhat.com>2003-01-15 23:04:20 +0000
commitc16abc04e8a7d4a9f6883b594b8a85765a8549a1 (patch)
treef969e11d8b83e9914b5b7f244fa6228d4cd090e7
parent282c00a71a9aa4ed23984d147d9b0d2a712755d3 (diff)
downloadglibc-c16abc04e8a7d4a9f6883b594b8a85765a8549a1.zip
glibc-c16abc04e8a7d4a9f6883b594b8a85765a8549a1.tar.gz
glibc-c16abc04e8a7d4a9f6883b594b8a85765a8549a1.tar.bz2
Update.
2003-01-15 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Include sysdep-cancel.h, not sysdep.h. 2003-01-15 Ulrich Drepper <drepper@redhat.com> * nscd/connections.c (nscd_run): Protect accept call with TEMP_FAILURE_RETRY.
-rw-r--r--ChangeLog10
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S4
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cd3ccfb..4238f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-15 Steven Munroe <sjmunroe@us.ibm.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Include
+ sysdep-cancel.h, not sysdep.h.
+
+2003-01-15 Ulrich Drepper <drepper@redhat.com>
+
+ * nscd/connections.c (nscd_run): Protect accept call with
+ TEMP_FAILURE_RETRY.
+
2003-01-15 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/Makefile: Include $(common-objpfx)s-proto-bp.d.
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S
index a4e27c3..5d721e1 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <sysdep.h>
+#include <sysdep-cancel.h>
#include <socketcall.h>
#define P(a, b) P2(a, b)
@@ -45,7 +45,7 @@
/* If this is just socket.S leave it alone! */
#else
#ifndef __socket
-#define __socket P(__,socket)
+#define __socket P(__,socket)
#endif
#endif