diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-11-30 06:33:11 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-30 06:33:11 +0000 |
commit | c1f8ef75d3ddf687efc5ee23e16075c256fa77be (patch) | |
tree | a3ea2de6f93ff7c1abd4190b14414cf458474436 /sysdeps | |
parent | f94203900a978cda33df395c36827a17d171f98e (diff) |
Updated to fedora-glibc-20041130T0624
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/bits/confname.h | 7 | ||||
-rw-r--r-- | sysdeps/posix/sysconf.c | 14 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/pread.c | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/pread64.c | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/pwrite.c | 5 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/pwrite64.c | 2 |
6 files changed, 28 insertions, 10 deletions
diff --git a/sysdeps/generic/bits/confname.h b/sysdeps/generic/bits/confname.h index d097a4ba1a..8947d48ed7 100644 --- a/sysdeps/generic/bits/confname.h +++ b/sysdeps/generic/bits/confname.h @@ -492,9 +492,14 @@ enum #define _SC_LEVEL4_CACHE_SIZE _SC_LEVEL4_CACHE_SIZE _SC_LEVEL4_CACHE_ASSOC, #define _SC_LEVEL4_CACHE_ASSOC _SC_LEVEL4_CACHE_ASSOC - _SC_LEVEL4_CACHE_LINESIZE + _SC_LEVEL4_CACHE_LINESIZE, #define _SC_LEVEL4_CACHE_LINESIZE _SC_LEVEL4_CACHE_LINESIZE /* Leave room here, maybe we need a few more cache levels some day. */ + + _SC_IPV6 = _SC_LEVEL1_ICACHE_SIZE + 50, +#define _SC_IPV6 _SC_IPV6 + _SC_RAW_SOCKETS +#define _SC_RAW_SOCKETS _SC_RAW_SOCKETS }; /* Values for the NAME argument to `confstr'. */ diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index de81c2120b..a4bc2e78b1 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -1189,6 +1189,20 @@ __sysconf (name) return zero which indicates that no information is available. */ return 0; + + case _SC_IPV6: +#ifdef _POSIX_IPV6 + return _POSIX_IPV6; +#else + return -1; +#endif + + case _SC_RAW_SOCKETS: +#ifdef _POSIX_RAW_SOCKETS + return _POSIX_RAW_SOCKETS; +#else + return -1; +#endif } } diff --git a/sysdeps/unix/sysv/linux/mips/pread.c b/sysdeps/unix/sysv/linux/mips/pread.c index d0947bea42..eff7d473d0 100644 --- a/sysdeps/unix/sysv/linux/mips/pread.c +++ b/sysdeps/unix/sysv/linux/mips/pread.c @@ -20,7 +20,9 @@ #include <assert.h> #include <errno.h> +#ifndef NO_SGIDEFS_H #include <sgidefs.h> +#endif #include <unistd.h> #include <endian.h> @@ -29,9 +31,6 @@ #include <bp-checks.h> #include <kernel-features.h> -#ifndef NO_SGIDEFS_H -#include <sgidefs.h> -#endif #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ # ifdef __NR_pread diff --git a/sysdeps/unix/sysv/linux/mips/pread64.c b/sysdeps/unix/sysv/linux/mips/pread64.c index e8a45da5b1..d8763acabb 100644 --- a/sysdeps/unix/sysv/linux/mips/pread64.c +++ b/sysdeps/unix/sysv/linux/mips/pread64.c @@ -19,7 +19,9 @@ 02111-1307 USA. */ #include <errno.h> +#ifndef NO_SGIDEFS_H #include <sgidefs.h> +#endif #include <unistd.h> #include <endian.h> @@ -28,9 +30,6 @@ #include <bp-checks.h> #include <kernel-features.h> -#ifndef NO_SGIDEFS_H -#include <sgidefs.h> -#endif #ifdef __NR_pread64 /* Newer kernels renamed but it's the same. */ # ifdef __NR_pread diff --git a/sysdeps/unix/sysv/linux/mips/pwrite.c b/sysdeps/unix/sysv/linux/mips/pwrite.c index 130515af6d..4378ebc859 100644 --- a/sysdeps/unix/sysv/linux/mips/pwrite.c +++ b/sysdeps/unix/sysv/linux/mips/pwrite.c @@ -20,7 +20,9 @@ #include <assert.h> #include <errno.h> +#ifndef NO_SGIDEFS_H #include <sgidefs.h> +#endif #include <unistd.h> #include <endian.h> @@ -29,9 +31,6 @@ #include <bp-checks.h> #include <kernel-features.h> -#ifndef NO_SGIDEFS_H -#include <sgidefs.h> -#endif #ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */ # ifdef __NR_pwrite diff --git a/sysdeps/unix/sysv/linux/mips/pwrite64.c b/sysdeps/unix/sysv/linux/mips/pwrite64.c index e4908fa779..e5853e432e 100644 --- a/sysdeps/unix/sysv/linux/mips/pwrite64.c +++ b/sysdeps/unix/sysv/linux/mips/pwrite64.c @@ -19,7 +19,9 @@ 02111-1307 USA. */ #include <errno.h> +#ifndef NO_SGIDEFS_H #include <sgidefs.h> +#endif #include <unistd.h> #include <endian.h> |