summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-12-23 04:34:13 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-12-23 04:34:13 +0000
commitbede19c05bea1628767b2eaa0134618ed244d9ac (patch)
tree67898103d449dd6220128ffc9a543ca3b5347b60
parent979e816de608c440df2b957e4fa385969258f121 (diff)
downloadATCD-bede19c05bea1628767b2eaa0134618ed244d9ac.tar.gz
don't use hrtime_t for ACE_hrtime_t if ACE_LACKS_LONGLONG_T
-rw-r--r--ace/OS.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/OS.h b/ace/OS.h
index dc423be53ec..1ad1652fdf8 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -3589,12 +3589,12 @@ extern "C"
typedef short ACE_pri_t;
# endif /* ! ACE_HAS_STHREADS && ! DIGITAL_UNIX */
-# if defined (ACE_HAS_HI_RES_TIMER)
+# if defined (ACE_HAS_HI_RES_TIMER) && !defined (ACE_LACKS_LONGLONG_T)
/* hrtime_t is defined on systems (Suns) with ACE_HAS_HI_RES_TIMER */
typedef hrtime_t ACE_hrtime_t;
-# else
+# else /* ! ACE_HAS_HI_RES_TIMER || ACE_LACKS_LONGLONG_T */
typedef ACE_UINT64 ACE_hrtime_t;
-# endif /* ACE_HAS_HI_RES_TIMER */
+# endif /* ! ACE_HAS_HI_RES_TIMER || ACE_LACKS_LONGLONG_T */
# endif /* !defined (ACE_WIN32) && !defined (ACE_PSOS) */