diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 17:30:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-01 17:30:15 +0000 |
| commit | 2c1f6ebe1177c8584a76b6fa31a010301a242e47 (patch) | |
| tree | f2f81357754d353115affc8f0d62f4515e6aaa59 /ACE/ace/Default_Constants.h | |
| parent | f32400de6371808aab7e21ebdc298a52e6d2add2 (diff) | |
| download | ATCD-2c1f6ebe1177c8584a76b6fa31a010301a242e47.tar.gz | |
Fri May 1 17:29:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Default_Constants.h:
Made sure ACE_DEFAULT_TIMERS is defined and not zero
Fri May 1 12:27:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Default_Constants.h:
ACE_DEFAULT_MAP_SIZE and ACE_DEFAULT_TIMERS shouldn't be zero
Diffstat (limited to 'ACE/ace/Default_Constants.h')
| -rw-r--r-- | ACE/ace/Default_Constants.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index 142fca6334c..14a71f01749 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -18,7 +18,7 @@ #define ACE_DEFAULT_CONSTANTS_H #include /**/ "ace/pre.h" -// Included just keep compilers that see #pragma dierctive first +// Included just keep compilers that see #pragma directive first // happy. #include /**/ "ace/config-all.h" @@ -26,6 +26,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +// For _POSIX_TIMER_MAX +#include "ace/os_include/os_limits.h" + // Define the default constants for ACE. Many of these are used for // the ACE tests and applications. You can change these values by // defining the macros in your config.h file. @@ -465,12 +468,12 @@ // Default number of ACE_Event_Handlers supported by // ACE_Timer_Heap. -#if !defined (ACE_DEFAULT_TIMERS) +#if !defined (ACE_DEFAULT_TIMERS) && defined (_POSIX_TIMER_MAX) # define ACE_DEFAULT_TIMERS _POSIX_TIMER_MAX #endif /* ACE_DEFAULT_TIMERS */ -#if defined (ACE_DEFAULT_TIMERS) && (ACE_DEFAULT_TIMERS == 0) -//#error ACE_DEFAULT_TIMERS should not be zero +#if !defined (ACE_DEFAULT_TIMERS) || (defined (ACE_DEFAULT_TIMERS) && (ACE_DEFAULT_TIMERS == 0)) +#error ACE_DEFAULT_TIMERS should be defined and not be zero #endif /* ACE_DEFAULT_TIMERS */ #if defined (ACE_WIN32) |