diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-22 19:37:03 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-02-22 19:37:03 +0000 |
| commit | 354ef99c8d685607a69794209a41b64b1f92548e (patch) | |
| tree | e37172de39cc1115d69d3e7b377778a692474d90 | |
| parent | 92fc58c9ea281500e5553b40f9d23de951a50864 (diff) | |
| download | ATCD-354ef99c8d685607a69794209a41b64b1f92548e.tar.gz | |
ChangeLogTag: Wed Feb 22 21:30:35 UTC 2006 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ace/Truncate.inl | 2 | ||||
| -rw-r--r-- | ace/config-lynxos.h | 20 |
3 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 01598225f05..f6f75d6a177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Feb 22 21:30:35 UTC 2006 Olli Savia <ops@iki.fi> + + * ace/Truncate.inl: + Added include "ace/os_include/os_limits.h" to pull INT_MAX. + + * ace/config-lynxos.h: + Define ACE_LACKS_NUMERIC_LIMITS when compiling with GCC 2.x. + Define ACE_HAS_POSIX_SEM on LynxOS 4.0. + Wed Feb 22 19:16:32 UTC 2006 Steve Huston <shuston@riverace.com> * ace/ACE_export.h: Add __HP_aCC 06.05 and up to the list of compilers @@ -20,7 +29,7 @@ Wed Feb 22 17:26:01 UTC 2006 Olli Savia <ops@iki.fi> * examples/IPC_SAP/DEV_SAP/reader/reader.cpp: * examples/IPC_SAP/DEV_SAP/writer/writer.cpp: Changed to reflect recent changes in TTY_IO.h. - + Wed Feb 22 16:31:28 UTC 2006 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/config/vcl.mpb: diff --git a/ace/Truncate.inl b/ace/Truncate.inl index 825559a8004..692e1451ebd 100644 --- a/ace/Truncate.inl +++ b/ace/Truncate.inl @@ -11,6 +11,8 @@ #undef min #endif #include <limits> +#else +#include "ace/os_include/os_limits.h" #endif /* ACE_LACKS_NUMERIC_LIMITS */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index 63619c9cfec..5585488b82d 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -3,13 +3,6 @@ // The following configuration file is designed to work for LynxOS, // version 3.0.0 and later, using the GNU g++ compiler. -// Note on why ACE_HAS_POSIX_SEM is not #defined: -// ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition -// variables to be used. But, they don't appear to be intended to be -// used between processes. Without ACE_HAS_POSIX_SEM, ACE uses -// semaphores for all synchronization. Those can be used between -// processes - #ifndef ACE_CONFIG_H #define ACE_CONFIG_H #include /**/ "ace/pre.h" @@ -162,6 +155,10 @@ # undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES #endif /* __GNUC__ == 2 && __GNUC_MINOR__ == 9 */ +#if __GNUC__ < 3 +# define ACE_LACKS_NUMERIC_LIMITS +#endif /* __GNUC__ < 3 */ + // By default, don't include RCS Id strings in object code. #if !defined (ACE_USE_RCSID) # define ACE_USE_RCSID 0 @@ -173,12 +170,21 @@ #if ACE_LYNXOS_MAJOR > 3 /* LynxOS 4.x */ # define ACE_HAS_SVR4_DYNAMIC_LINKING # define ACE_HAS_BROKEN_THREAD_KEYFREE +# define ACE_HAS_POSIX_SEM // "changes signedness" error (OS.i and many other files) # define ACE_HAS_SOCKLEN_T // LSOCK.cpp uses a macro from param.h, not included # define ALIGNBYTES (sizeof(int) - 1) # define ALIGN(p) (((unsigned)p + ALIGNBYTES) & ~ALIGNBYTES) #else /* LynxOS 3.x */ + // Note on why ACE_HAS_POSIX_SEM is not #defined: + // ACE_HAS_POSIX_SEM would cause native LynxOS mutexes and condition + // variables to be used. But, they don't appear to be intended to be + // used between processes. Without ACE_HAS_POSIX_SEM, ACE uses + // semaphores for all synchronization. Those can be used between + // processes + //# define ACE_HAS_POSIX_SEM + // Don't use MAP_FIXED, at least for now. # define ACE_MAP_FIXED 0 // LynxOS, through 3.0.0, does not support MAP_PRIVATE, |