From bf7b7282f5cd65bcdd80f55eeebc90fab50c9159 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 27 Jul 2013 00:02:39 -0400 Subject: a few more fixes for unistd/sysconf feature reporting --- include/unistd.h | 1 + src/conf/sysconf.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/unistd.h b/include/unistd.h index 151a6ce9..13acc147 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -237,6 +237,7 @@ void syncfs(int); #define _POSIX_READER_WRITER_LOCKS _POSIX_VERSION #define _POSIX_ASYNCHRONOUS_IO _POSIX_VERSION #define _POSIX_SEMAPHORES _POSIX_VERSION +#define _POSIX_SHARED_MEMORY_OBJECTS _POSIX_VERSION #define _POSIX2_C_BIND _POSIX_VERSION diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c index b2e94e52..d979b626 100644 --- a/src/conf/sysconf.c +++ b/src/conf/sysconf.c @@ -27,14 +27,14 @@ long sysconf(int name) [_SC_ASYNCHRONOUS_IO] = VER, [_SC_PRIORITIZED_IO] = -1, [_SC_SYNCHRONIZED_IO] = -1, - [_SC_FSYNC] = -1, + [_SC_FSYNC] = VER, [_SC_MAPPED_FILES] = VER, [_SC_MEMLOCK] = VER, [_SC_MEMLOCK_RANGE] = VER, [_SC_MEMORY_PROTECTION] = VER, [_SC_MESSAGE_PASSING] = VER, [_SC_SEMAPHORES] = VER, - [_SC_SHARED_MEMORY_OBJECTS] = -1, + [_SC_SHARED_MEMORY_OBJECTS] = VER, [_SC_AIO_LISTIO_MAX] = -1, [_SC_AIO_MAX] = -1, [_SC_AIO_PRIO_DELTA_MAX] = 0, /* ?? */ @@ -85,7 +85,7 @@ long sysconf(int name) [_SC_GETPW_R_SIZE_MAX] = -1, [_SC_LOGIN_NAME_MAX] = 256, [_SC_TTY_NAME_MAX] = TTY_NAME_MAX, - [_SC_THREAD_DESTRUCTOR_ITERATIONS] = _POSIX_THREAD_DESTRUCTOR_ITERATIONS, + [_SC_THREAD_DESTRUCTOR_ITERATIONS] = PTHREAD_DESTRUCTOR_ITERATIONS, [_SC_THREAD_KEYS_MAX] = PTHREAD_KEYS_MAX, [_SC_THREAD_STACK_MIN] = PTHREAD_STACK_MIN, [_SC_THREAD_THREADS_MAX] = -1, @@ -103,7 +103,7 @@ long sysconf(int name) [_SC_PASS_MAX] = -1, [_SC_XOPEN_VERSION] = _XOPEN_VERSION, [_SC_XOPEN_XCU_VERSION] = _XOPEN_VERSION, - [_SC_XOPEN_UNIX] = -1, + [_SC_XOPEN_UNIX] = 1, [_SC_XOPEN_CRYPT] = -1, [_SC_XOPEN_ENH_I18N] = 1, [_SC_XOPEN_SHM] = 1, @@ -140,7 +140,7 @@ long sysconf(int name) [_SC_XBS5_ILP32_OFF32] = -1, [_SC_XBS5_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1, [_SC_XBS5_LP64_OFF64] = 2*(sizeof(long)==8)-1, - [_SC_XBS5_LPBIG_OFFBIG] = 2*(sizeof(long)>=8)-1, + [_SC_XBS5_LPBIG_OFFBIG] = -1, [_SC_XOPEN_LEGACY] = -1, [_SC_XOPEN_REALTIME] = -1, [_SC_XOPEN_REALTIME_THREADS] = -1, @@ -191,7 +191,7 @@ long sysconf(int name) [_SC_V6_ILP32_OFF32] = -1, [_SC_V6_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1, [_SC_V6_LP64_OFF64] = 2*(sizeof(long)==8)-1, - [_SC_V6_LPBIG_OFFBIG] = 2*(sizeof(long)>=8)-1, + [_SC_V6_LPBIG_OFFBIG] = -1, [_SC_HOST_NAME_MAX] = HOST_NAME_MAX, [_SC_TRACE] = -1, [_SC_TRACE_EVENT_FILTER] = -1, @@ -203,7 +203,7 @@ long sysconf(int name) [_SC_V7_ILP32_OFF32] = -1, [_SC_V7_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1, [_SC_V7_LP64_OFF64] = 2*(sizeof(long)==8)-1, - [_SC_V7_LPBIG_OFFBIG] = 2*(sizeof(long)>=8)-1, + [_SC_V7_LPBIG_OFFBIG] = -1, [_SC_SS_REPL_MAX] = -1, [_SC_TRACE_EVENT_NAME_MAX] = -1, [_SC_TRACE_NAME_MAX] = -1, -- cgit v1.2.1