diff options
| -rw-r--r-- | ChangeLog-99b | 5 | ||||
| -rw-r--r-- | ace/config-linux-common.h | 38 |
2 files changed, 24 insertions, 19 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 1175bdc2bdf..552913be8b3 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,8 @@ +Thu Nov 04 08:16:25 1999 David L. Levine <levine@cs.wustl.edu> + + * config-linux-common.h: only enabled ACE_HAS_SIGTIMEDWAIT + with glibc. RedHat 5.2 doesn't have sigtimedwait. + Mon Nov 01 14:29:04 1999 David L. Levine <levine@cs.wustl.edu> * ace/Filecache.cpp,Capabilities.cpp,Makefile: moved diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h index 76e37f3908d..f327891e595 100644 --- a/ace/config-linux-common.h +++ b/ace/config-linux-common.h @@ -69,12 +69,15 @@ // NOTE: end of glibc 2.0 (0.961212-5)-specific configuration. # if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 -// These were suggested by Robert Hanzlik <robi@codalan.cz> to get -// ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8. + // These were suggested by Robert Hanzlik <robi@codalan.cz> to get + // ACE to compile on Linux using glibc 2.1 and libg++/gcc 2.8. # undef ACE_HAS_BYTESEX_H # define ACE_HAS_SIGINFO_T # define ACE_LACKS_SIGINFO_H # define ACE_HAS_UCONTEXT_T + + // Pre-glibc (RedHat 5.2) doesn't have sigtimedwait. +# define ACE_HAS_SIGTIMEDWAIT # endif /* __GLIBC__ 2.1+ */ #else /* ! __GLIBC__ */ // Fixes a problem with some non-glibc versions of Linux... @@ -82,6 +85,20 @@ # define ACE_LACKS_MSG_ACCRIGHTS #endif /* ! __GLIBC__ */ +// Linux has lseek64() +#define ACE_HAS_LLSEEK +// Don't define _LARGEFILE64_SOURCE in ACE to make lseek64() prototype +// visible. ACE shouldn't depend on feature test macros to make +// prototypes visible. +#if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 +# define ACE_LACKS_LSEEK64_PROTOTYPE +#endif /* __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 */ + +#if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 +# define ACE_HAS_P_READ_WRITE +# define ACE_LACKS_PREAD_PROTOTYPE +#endif /* __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 */ + // Then the compiler specific parts @@ -102,7 +119,6 @@ // Platform/compiler has the sigwait(2) prototype # define ACE_HAS_SIGWAIT -# define ACE_HAS_SIGTIMEDWAIT # define ACE_HAS_SIGSUSPEND #if !defined (ACE_DEFAULT_BASE_ADDR) @@ -192,22 +208,6 @@ #define ACE_HAS_DIRENT -// Linux has lseek64() -#define ACE_HAS_LLSEEK -// Don't define _LARGEFILE64_SOURCE in ACE to make lseek64() prototype -// visible. ACE shouldn't depend on feature test macros to make -// prototypes visible. -#if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 -# define ACE_LACKS_LSEEK64_PROTOTYPE -#endif /* __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 */ - -#if __GLIBC__ > 1 && __GLIBC_MINOR__ >= 1 -# define ACE_HAS_P_READ_WRITE -# define ACE_LACKS_PREAD_PROTOTYPE -#endif /* __GLIBC__ > 1 && __GLIBC_MINOR__ >= 0 */ - - - # define ACE_UINT64_FORMAT_SPECIFIER "%Lu" #if !defined (ACE_TIMER_SKEW) |