diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-05-04 19:37:29 -0400 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2012-05-05 00:06:58 +0000 |
commit | 24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92 (patch) | |
tree | 7f013133f597d608dfedf5e4b51946f5743802bb /util.c | |
parent | 5700f68471ef83aae4757bb84280e3fcc6e20692 (diff) | |
download | strace-24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92.tar.gz strace-24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92.tar.bz2 strace-24ee60b836ad33bb4ac694ca99d6c94a8cc5ff92.tar.xz |
util: fix building when glibc has a stub process_vm_readv
If you have a newer glibc which provides process_vm_readv, but it is built
against older kernel headers which lack __NR_process_vm_readv, the library
will contain a stub implementation that just returns ENOSYS. Autoconf
checks for this case explicitly and will declare it as unavailable. So we
end up in a case where the headers provide the prototype, but autoconf has
not defined HAVE_PROCESS_VM_READV, so we hit the same build failure again:
util.c:738:16: error: static declaration of 'process_vm_readv' follows non-static declaration
/usr/include/bits/uio.h:58:16: note: previous declaration of 'process_vm_readv' was here
So rename our local function to something unique, and add a define so the
callers all hit the right place.
* util.c (strace_process_vm_readv): Rename from process_vm_readv.
(process_vm_readv): Define to strace_process_vm_readv.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -735,7 +735,8 @@ static bool process_vm_readv_not_supported = 0; #if defined(__NR_process_vm_readv) static bool process_vm_readv_not_supported = 0; -static ssize_t process_vm_readv(pid_t pid, +/* Have to avoid duplicating with the C library headers. */ +static ssize_t strace_process_vm_readv(pid_t pid, const struct iovec *lvec, unsigned long liovcnt, const struct iovec *rvec, @@ -744,6 +745,7 @@ static ssize_t process_vm_readv(pid_t pid, { return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags); } +#define process_vm_readv strace_process_vm_readv #else static bool process_vm_readv_not_supported = 1; # define process_vm_readv(...) (errno = ENOSYS, -1) |