[commits] r3844 - in /fsf/trunk/ports: ChangeLog.hppa sysdeps/unix/sysv/linux/hppa/bits/fcntl.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Oct 18 00:05:28 2007
New Revision: 3844

Log:
Import glibc-ports-mainline for 2007-10-18

Modified:
    fsf/trunk/ports/ChangeLog.hppa
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h

Modified: fsf/trunk/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Thu Oct 18 00:05:28 2007
@@ -1,3 +1,8 @@
+2007-10-17  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Correct return value
+	type and __THROW marker of splice, vmsplice, and tee.
+
 2007-09-24  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/hppa/nptl/tls.h: Fix comment.

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h Thu Oct 18 00:05:28 2007
@@ -207,17 +207,17 @@
 			    unsigned int __flags);
 
 /* Splice address range into a pipe.  */
-extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
-		     unsigned int __flags);
+extern ssize_t vmsplice (int __fdout, const struct iovec *__iov, 
+			 size_t __count, unsigned int __flags);
 
 /* Splice two files together.  */
-extern int splice (int __fdin, __off64_t *offin, int __fdout, 
-		   __off64_t *__offout, size_t __len, unsigned int __flags)
-    __THROW;
+extern ssize_t splice (int __fdin, __off64_t *offin, int __fdout, 
+		       __off64_t *__offout, size_t __len,
+		       unsigned int __flags);
 
 /* In-kernel implementation of tee for pipe buffers.  */
-extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags)
-    __THROW;
+extern ssize_t tee (int __fdin, int __fdout, size_t __len,
+		    unsigned int __flags);
     
 #endif