diff options
author | Peter S. Mazinger <ps.m@gmx.net> | 2011-03-14 18:33:13 +0100 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:24 +0200 |
commit | 741caa9982ba54bd58867b59ce2acf07de779bab (patch) | |
tree | 528a8a0a9395bd3482c800782c8e93a8a5bddd7f | |
parent | d70e284a0d5132f1f53c96b726fd9ce5962f143a (diff) |
semaphore.h, uClibc_local_lim.h: make sure SEM_VALUE_MAX is always defined
LT old and new provided SEM_VALUE_MAX in semaphore.h, NPTL in local_lim.h
Make sure to get the same definitions, independently of the fact, that
semaphore.h is included or not.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_local_lim.h | 5 | ||||
-rw-r--r-- | libpthread/linuxthreads.old/semaphore.h | 3 | ||||
-rw-r--r-- | libpthread/linuxthreads/semaphore.h | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/common/bits/uClibc_local_lim.h b/libc/sysdeps/linux/common/bits/uClibc_local_lim.h index 832051cd7..0727ebf55 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_local_lim.h +++ b/libc/sysdeps/linux/common/bits/uClibc_local_lim.h @@ -20,7 +20,10 @@ /* glibc uses 16384 */ # define PTHREAD_THREADS_MAX 1024 # define TIMER_MAX 256 -# undef SEM_VALUE_MAX +# ifdef __LINUXTHREADS_OLD__ +# undef SEM_VALUE_MAX +# define SEM_VALUE_MAX ((int) ((~0u) >> 1)) +# endif # undef PTHREAD_STACK_MIN /* glibc uses at least 16364 */ # define PTHREAD_STACK_MIN 1024 diff --git a/libpthread/linuxthreads.old/semaphore.h b/libpthread/linuxthreads.old/semaphore.h index fea127b1e..c5ff6a038 100644 --- a/libpthread/linuxthreads.old/semaphore.h +++ b/libpthread/linuxthreads.old/semaphore.h @@ -17,6 +17,7 @@ #include <features.h> #include <sys/types.h> +#include <limits.h> #ifdef __USE_XOPEN2K # define __need_timespec # include <time.h> @@ -42,7 +43,9 @@ typedef struct #define SEM_FAILED ((sem_t *) 0) /* Maximum value the semaphore can have. */ +#ifndef SEM_VALUE_MAX #define SEM_VALUE_MAX ((int) ((~0u) >> 1)) +#endif __BEGIN_DECLS diff --git a/libpthread/linuxthreads/semaphore.h b/libpthread/linuxthreads/semaphore.h index 3084209f6..f9ad4c536 100644 --- a/libpthread/linuxthreads/semaphore.h +++ b/libpthread/linuxthreads/semaphore.h @@ -17,6 +17,7 @@ #include <features.h> #include <sys/types.h> +#include <limits.h> #ifdef __USE_XOPEN2K # define __need_timespec # include <time.h> @@ -42,7 +43,9 @@ typedef struct #define SEM_FAILED ((sem_t *) 0) /* Maximum value the semaphore can have. */ +#ifndef SEM_VALUE_MAX #define SEM_VALUE_MAX (2147483647) +#endif __BEGIN_DECLS |