diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2005-06-27 21:55:07 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2005-06-27 21:55:07 +0000 |
| commit | 3bfd092b9d5ddb25c9810658831a520529bd0650 (patch) | |
| tree | d99c412dda8e6efd28dacd988311fa897e4de281 /ace/config-linux-common.h | |
| parent | bcd9b396e000fda35ac07d87aabac642242ab916 (diff) | |
| download | ATCD-3bfd092b9d5ddb25c9810658831a520529bd0650.tar.gz | |
ChangeLogTag: Mon Jun 27 21:54:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'ace/config-linux-common.h')
| -rw-r--r-- | ace/config-linux-common.h | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 06e7f2b199f..9f057600645 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -36,42 +36,31 @@ # endif /* !ACE_HAS_CLOCK_GETTIME */ #endif /* _POSIX_C_SOURCE >= 199309L */ -#include "ace/config-posix.h" +#if defined (ACE_HAS_LINUX_NPTL) +# include "ace/config-posix.h" -// Temporary fix because >2.6 kernels do have shm_open but there is a problem -// with that somewhere which needs to be fixed when I have time. -#if defined (ACE_HAS_SHM_OPEN) -# undef ACE_HAS_SHM_OPEN -#endif - -#include <linux/version.h> - -#if defined (ACE_HAS_POSIX_SEM) - -# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) - // Linux versions < 2.6 may define the right POSIX macro - // but they lack the full runtime support for this stuff so - // it's better not to use them -# undef ACE_HAS_POSIX_SEM + // Temporary fix because NPTL kernels do have shm_open but there is a problem + // with shm_open/shm_unlink pairing in ACE which needs to be fixed when I have time. +# if defined (ACE_HAS_SHM_OPEN) +# undef ACE_HAS_SHM_OPEN # endif +# include <linux/version.h> + # if defined (ACE_USES_FIFO_SEM) -# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - // Don't use this for Linux >= 2.6 since this has complete - // POSIX semaphores which are more efficient -# undef ACE_USES_FIFO_SEM -# endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */ + // Don't use this for Linux NPTL since this has complete + // POSIX semaphores which are more efficient +# undef ACE_USES_FIFO_SEM # endif /* ACE_USES_FIFO_SEM */ -# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) - // Linux versions >= 2.6 may not define the right POSIX macro +# if defined (ACE_HAS_POSIX_SEM) + // Linux NPTL may not define the right POSIX macro // but they have the actual runtime support for this stuff # if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600)) # define ACE_HAS_POSIX_SEM_TIMEOUT # endif /* !ACE_HAS_POSIX_SEM_TIMEOUT && (((_POSIX_C_SOURCE - 0) >= 200112L) || (_XOPEN_SOURCE >= 600)) */ -# endif - -#endif /* ACE_HAS_POSIX_SEM */ +# endif /* ACE_HAS_POSIX_SEM */ +#endif /* ACE_HAS_LINUX_NPTL */ // First the machine specific part |