summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-01-25 06:12:08 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-01-25 06:16:56 +0100
commit74ca0c98cb8b4e6f75858ca2b2746744f2558493 (patch)
tree2999b63239b319ac416e5af7ee4a1e5a80a3ad11 /libc/sysdeps/linux
parente64b864d6d4e020a94d3931704ccea50d1a20b82 (diff)
parentc4b750195714ec7c10aa4de15610c5aae0751c1c (diff)
Merge branch 'master' into nptl
Conflicts: libc/inet/Makefile.in libc/inet/hostid.c Synchronise nptl branch with master branch @ c4b750195714ec7c10aa4de15610c5aae0751c1c Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/sysdeps/linux')
-rw-r--r--libc/sysdeps/linux/common/sysctl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/common/sysctl.c b/libc/sysdeps/linux/common/sysctl.c
index f65a3eaa2..dde00be46 100644
--- a/libc/sysdeps/linux/common/sysctl.c
+++ b/libc/sysdeps/linux/common/sysctl.c
@@ -10,6 +10,7 @@
#include <sys/syscall.h>
#if defined __NR__sysctl && (defined __USE_GNU || defined __USE_BSD)
+/* psm: including sys/sysctl.h would depend on kernel headers */
struct __sysctl_args {
int *name;
int nlen;
@@ -19,7 +20,8 @@ struct __sysctl_args {
size_t newlen;
unsigned long __unused[4];
};
-
+extern int sysctl (int *__name, int __nlen, void *__oldval,
+ size_t *__oldlenp, void *__newval, size_t __newlen) __THROW;
int sysctl(int *name, int nlen, void *oldval, size_t * oldlenp,
void *newval, size_t newlen)
{