diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1997-07-30 16:30:07 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1997-07-30 16:30:07 +0000 |
| commit | 911f809f64e7f57acedcfee58fafa12419219239 (patch) | |
| tree | edf2b56df2899bc32ec0951ffb97ccca1d805b26 | |
| parent | 4842953d95d9117674c289c558c4c1256e834d1a (diff) | |
| download | ATCD-911f809f64e7f57acedcfee58fafa12419219239.tar.gz | |
Fixed problem with longlong and the high res timer.
| -rw-r--r-- | ace/OS.cpp | 2 | ||||
| -rw-r--r-- | ace/config-linux-lxpthreads.h | 2 | ||||
| -rw-r--r-- | ace/config-linux-pthread.h | 2 | ||||
| -rw-r--r-- | ace/config-linux.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index eaeb843e036..2671f4b5845 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -213,7 +213,7 @@ ACE_OS::gethrtime (void) // potentially being used without being initialized, but the // assembly code insures that they ARE initialized. So, that // warning can be ignored. - unsigned long least, most; + volatile unsigned long least, most; asm ("rdtsc"); asm ("movl %eax, -4(%ebp)"); // least diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h index 4545756bf1b..79a9051002a 100644 --- a/ace/config-linux-lxpthreads.h +++ b/ace/config-linux-lxpthreads.h @@ -34,7 +34,7 @@ #define ACE_HAS_LONG_FDMASK #define ACE_HAS_PENTIUM -#define ACE_HAS_LONGLONG +#define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS // Fixes a problem with new versions of Linux... diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h index b952623efe0..6050ab859c5 100644 --- a/ace/config-linux-pthread.h +++ b/ace/config-linux-pthread.h @@ -13,7 +13,7 @@ #define ACE_HAS_LONG_FDMASK #define ACE_HAS_PENTIUM -#define ACE_HAS_LONGLONG +#define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS // Fixes a problem with new versions of Linux... diff --git a/ace/config-linux.h b/ace/config-linux.h index 5f0c8c25bc0..8a115a03a3e 100644 --- a/ace/config-linux.h +++ b/ace/config-linux.h @@ -19,7 +19,7 @@ #define ACE_HAS_LONG_FDMASK #define ACE_HAS_PENTIUM -#define ACE_HAS_LONGLONG +#define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS // Fixes a problem with new versions of Linux... |