about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-04-09 21:45:21 +0000
committerUlrich Drepper <drepper@redhat.com>2009-04-09 21:45:21 +0000
commitf9fe75e9455f8473ce9b5c34cfb9e6a22627be09 (patch)
tree9aeb9ad6da7b170661f0c1831556efebc554c0b6
parent28b2771a4bf6f04197da6d5081f7330b54a2ce91 (diff)
downloadglibc-f9fe75e9455f8473ce9b5c34cfb9e6a22627be09.tar.gz
glibc-f9fe75e9455f8473ce9b5c34cfb9e6a22627be09.tar.xz
glibc-f9fe75e9455f8473ce9b5c34cfb9e6a22627be09.zip
* sysdeps/unix/sysv/linux/preadv.c: Avoid prototype for static
	function if it is not defined.
	* sysdeps/unix/sysv/linux/pwritev.c: Likewise.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/preadv.c2
-rw-r--r--sysdeps/unix/sysv/linux/pwritev.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f3622bb627..b3c1302937 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-04-09  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/preadv.c: Avoid prototype for static
+	function if it is not defined.
+	* sysdeps/unix/sysv/linux/pwritev.c: Likewise.
+
 	* sysdeps/unix/sysv/linux/kernel-features.h: SPARC and IA64 also
 	have preadv/pwritev in 2.6.30.
 
diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c
index e2f8238596..ff9af6fa05 100644
--- a/sysdeps/unix/sysv/linux/preadv.c
+++ b/sysdeps/unix/sysv/linux/preadv.c
@@ -36,8 +36,10 @@
 # define OFF_T off_t
 #endif
 
+#ifndef __ASSUME_PREADV
 static ssize_t PREADV_REPLACEMENT (int, __const struct iovec *,
 				   int, OFF_T) internal_function;
+#endif
 
 
 ssize_t
diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c
index df430ffe46..2031adda10 100644
--- a/sysdeps/unix/sysv/linux/pwritev.c
+++ b/sysdeps/unix/sysv/linux/pwritev.c
@@ -36,8 +36,10 @@
 # define OFF_T off_t
 #endif
 
+#ifndef __ASSUME_PWRITEV
 static ssize_t PWRITEV_REPLACEMENT (int, __const struct iovec *,
 				    int, OFF_T) internal_function;
+#endif
 
 
 ssize_t