diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-15 16:36:11 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-09-15 16:36:11 +0000 |
| commit | 4e16e2d9d5da54ea076672d30062baac76fac610 (patch) | |
| tree | 70e02e9d7a575a298aac6c1a5ae543db5cdd72fc | |
| parent | c3f95239ffaaf99040b45aaaebff9d9f4bb1790d (diff) | |
| download | ATCD-4e16e2d9d5da54ea076672d30062baac76fac610.tar.gz | |
only define ACE_HAS_PENTIUM if i386 is defined
| -rw-r--r-- | ace/config-linux-lxpthreads.h | 10 | ||||
| -rw-r--r-- | ace/config-linux-pthread.h | 10 | ||||
| -rw-r--r-- | ace/config-linux.h | 11 |
3 files changed, 28 insertions, 3 deletions
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h index 17a5acb1488..2cfb57877e4 100644 --- a/ace/config-linux-lxpthreads.h +++ b/ace/config-linux-lxpthreads.h @@ -32,8 +32,16 @@ #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ +#if defined (i386) + // If running an Intel, assume that it's a Pentium so that + // ACE_OS::gethrtime () can use the RDTSC instruction. If + // running a 486 or lower, be sure to comment this out. + // (If not running an Intel CPU, this #define will not be seen + // because of the i386 protection, so it can be ignored.) +# define ACE_HAS_PENTIUM +#endif /* i386 */ + #define ACE_HAS_LONG_FDMASK -#define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h index 9b195264c54..6dcc5510154 100644 --- a/ace/config-linux-pthread.h +++ b/ace/config-linux-pthread.h @@ -11,8 +11,16 @@ #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ +#if defined (i386) + // If running an Intel, assume that it's a Pentium so that + // ACE_OS::gethrtime () can use the RDTSC instruction. If + // running a 486 or lower, be sure to comment this out. + // (If not running an Intel CPU, this #define will not be seen + // because of the i386 protection, so it can be ignored.) +# define ACE_HAS_PENTIUM +#endif /* i386 */ + #define ACE_HAS_LONG_FDMASK -#define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS // Optimize ACE_Handle_Set for select(). diff --git a/ace/config-linux.h b/ace/config-linux.h index 53b090a0823..aa5c6bee070 100644 --- a/ace/config-linux.h +++ b/ace/config-linux.h @@ -13,6 +13,16 @@ // Do we really need this #define here? #define LINUX + +#if defined (i386) + // If running an Intel, assume that it's a Pentium so that + // ACE_OS::gethrtime () can use the RDTSC instruction. If + // running a 486 or lower, be sure to comment this out. + // (If not running an Intel CPU, this #define will not be seen + // because of the i386 protection, so it can be ignored.) +# define ACE_HAS_PENTIUM +#endif /* i386 */ + // ONLY define this if you have config'd multicast into a 2.x kernel. // If you do anything else, we've never tested it! #define ACE_HAS_IP_MULTICAST @@ -21,7 +31,6 @@ // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG_T #define ACE_HAS_STRING_CLASS |