aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2007-10-18 02:19:00 +0000
committerCarlos O'Donell <carlos@systemhalted.org>2007-10-18 02:19:00 +0000
commitd3fad32baf601770a164e6367d52a3da1a566f4d (patch)
tree4b16ba1e764625f3e7d81d05797145dcc79de311
parent90e90b183d262e1ea8b3154699c730db84cc2187 (diff)
downloadglibc-d3fad32baf601770a164e6367d52a3da1a566f4d.tar.xz
glibc-d3fad32baf601770a164e6367d52a3da1a566f4d.zip
2007-10-17 Carlos O'Donell <carlos@systemhalted.org>
* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Correct return value type and __THROW marker of splice, vmsplice, and tee.
-rw-r--r--ChangeLog.hppa5
-rw-r--r--sysdeps/unix/sysv/linux/hppa/bits/fcntl.h14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 9501c490f3..e5b7854654 100644
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2007-10-17 Carlos O'Donell <carlos@systemhalted.org>
+
+ * 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@systemhalted.org>
* sysdeps/hppa/nptl/tls.h: Fix comment.
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
index 1bf6bcba75..80cbbf44ea 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
@@ -207,17 +207,17 @@ extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,
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