aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-30 15:05:29 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-30 15:05:29 +0000
commit99ea5991a4957f7a21466a4b48c5020eb70db2b7 (patch)
treecd17c29218b0a06efa7686d1c8cbb363fdeebacb
parent950398e1320255572f4228db94344dcd5f613455 (diff)
downloadglibc-99ea5991a4957f7a21466a4b48c5020eb70db2b7.tar
glibc-99ea5991a4957f7a21466a4b48c5020eb70db2b7.tar.gz
glibc-99ea5991a4957f7a21466a4b48c5020eb70db2b7.tar.bz2
glibc-99ea5991a4957f7a21466a4b48c5020eb70db2b7.zip
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (splice): Add offin
and offout arguments to the prototype. * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/sh/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (splice): Likewise. * sysdeps/unix/sysv/linux/syscalls.list (splice): Adjust args string.
-rw-r--r--ChangeLog13
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/i386/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/sh/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/fcntl.h3
-rw-r--r--sysdeps/unix/sysv/linux/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h3
10 files changed, 30 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b771b341d..a75ac8b23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-08-30 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (splice): Add offin
+ and offout arguments to the prototype.
+ * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/sh/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (splice): Likewise.
+ * sysdeps/unix/sysv/linux/syscalls.list (splice): Adjust args string.
+
2006-08-28 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_init_paths): Expand DSTs.
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
index 6084c38c91..f17dc2bdc1 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
@@ -216,7 +216,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
index 1f7ac0f25a..6de33302ee 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
index ef66d465de..ed8c2da9e2 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
@@ -218,7 +218,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
index 57fc7bd987..c4964e0fd8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
index e5a917dbfa..c611028f29 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/fcntl.h
@@ -244,7 +244,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
index 1f7ac0f25a..6de33302ee 100644
--- a/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/fcntl.h
@@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
index a965d31654..d68bfeb0ef 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
@@ -243,7 +243,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index afb6d80978..fca29b26ff 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -67,7 +67,7 @@ setfsgid EXTRA setfsgid i:i setfsgid
setfsuid EXTRA setfsuid i:i setfsuid
setpgid - setpgid i:ii __setpgid setpgid
sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack
-splice EXTRA splice i:iiii splice
+splice EXTRA splice i:iPiPii splice
sysinfo EXTRA sysinfo i:p sysinfo
swapon - swapon i:si __swapon swapon
swapoff - swapoff i:s __swapoff swapoff
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
index 4f10f22224..fa1d02bc1f 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
@@ -238,7 +238,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
-extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
+extern int splice (int __fdin, __off64_t *__offin, int __fdout,
+ __off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */