diff options
| -rw-r--r-- | ace/OS.cpp | 6 | ||||
| -rw-r--r-- | ace/config-linux-lxpthreads.h | 3 | ||||
| -rw-r--r-- | ace/config-linux-pthread.h | 3 | ||||
| -rw-r--r-- | ace/config-linux.h | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index 9ab48a4cf36..dffde548e8d 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -294,6 +294,12 @@ ACE_Countdown_Time::~ACE_Countdown_Time (void) this->stop (); } +#if defined (ACE_HAS_PENTIUM) && defined (linux) + // see comments in OS.i in ACE_OS::gethrtime () definition + unsigned long ACE_OS_gethrtime_least; + unsigned long ACE_OS_gethrtime_most; +#endif /* ACE_HAS_PENTIUM && linux */ + #if defined(ACE_MT_SAFE) && defined(ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) int ACE_OS::netdb_mutex_inited_ = 0; diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h index cde763730dd..db436dd630b 100644 --- a/ace/config-linux-lxpthreads.h +++ b/ace/config-linux-lxpthreads.h @@ -28,6 +28,9 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H +#define ACE_HAS_PENTIUM +#define ACE_HAS_LONGLONG + // Fixes a problem with new versions of Linux... #ifndef msg_accrights #undef msg_control diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h index f51e803689d..9de25cd9a0e 100644 --- a/ace/config-linux-pthread.h +++ b/ace/config-linux-pthread.h @@ -7,6 +7,9 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H +#define ACE_HAS_PENTIUM +#define ACE_HAS_LONGLONG + // Fixes a problem with new versions of Linux... #ifndef msg_accrights #undef msg_control diff --git a/ace/config-linux.h b/ace/config-linux.h index 93a20d4dee3..583fd14cd4a 100644 --- a/ace/config-linux.h +++ b/ace/config-linux.h @@ -10,6 +10,9 @@ // Do we really need this #define here? #define LINUX 1.2.10 +#define ACE_HAS_PENTIUM +#define ACE_HAS_LONGLONG + // Fixes a problem with new versions of Linux... #ifndef msg_accrights #undef msg_control |