From c16abc04e8a7d4a9f6883b594b8a85765a8549a1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 15 Jan 2003 23:04:20 +0000
Subject: [PATCH] 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.
---
 ChangeLog                                          | 10 ++++++++++
 sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd3ccfb3bf..4238f5e878 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 a4e27c3611..5d721e157c 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