summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-22 22:51:17 +0000
committerRoland McGrath <roland@gnu.org>2005-02-22 22:51:17 +0000
commita2274a083886991627cab87ca323296a97f631be (patch)
tree5ff7c3b13238a5368260cf2277f2b33d322e7aca /include
parent61a4f6fb43e7c66d7785b290b9dfa93c1ad24e1d (diff)
downloadglibc-a2274a083886991627cab87ca323296a97f631be.tar.gz
glibc-a2274a083886991627cab87ca323296a97f631be.tar.xz
glibc-a2274a083886991627cab87ca323296a97f631be.zip
* include/sys/socket.h: Declare __recv.
	* sysdeps/generic/recv.c (recv): Rename to __recv, and add weak alias.
	* sysdeps/mach/hurd/recv.c: Likewise.

	* sysdeps/unix/sysv/linux/libc_fatal.c: Include <execinfo.h> for
	__backtrace_* decls.

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
	(INTERNAL_SYSCALL_ERROR_P): Evalute VAL.  Parenthesize ERR.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.

	* include/signal.h: Include <string.h> for memset decl.
Diffstat (limited to 'include')
-rw-r--r--include/signal.h1
-rw-r--r--include/sys/socket.h8
2 files changed, 9 insertions, 0 deletions
diff --git a/include/signal.h b/include/signal.h
index dc1e0a12e5..5f07844f6a 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -50,6 +50,7 @@ extern int __xpg_sigpause (int sig);
 
 /* Simplified sigemptyset() implementation without the parameter checking.  */
 #undef __sigemptyset
+#include <string.h>
 #define __sigemptyset(ss) (memset (ss, '\0', sizeof (sigset_t)), 0)
 
 
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 937909a125..0a226726aa 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -59,6 +59,14 @@ extern int __connect (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len);
 extern int __connect_internal (int __fd, __CONST_SOCKADDR_ARG __addr,
 			       socklen_t __len) attribute_hidden;
 
+/* Read N bytes into BUF from socket FD.
+   Returns the number read or -1 for errors.
+
+   This function is a cancellation point and therefore not marked with
+   __THROW.  */
+extern ssize_t __recv (int __fd, void *__buf, size_t __n, int __flags)
+     attribute_hidden;
+
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */
 extern ssize_t __libc_sendto (int __fd, __const void *__buf, size_t __n,