summaryrefslogtreecommitdiff
path: root/ace/Profile_Timer.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-19 12:53:49 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-07-19 12:53:49 +0000
commitd79c933df9aeef8418f6ec8af4d8ed8c969f72ab (patch)
treee2b8488d79d7f6bdbcffffa63b7118abb15ed658 /ace/Profile_Timer.cpp
parenta1d57ae1d0d5d18f399ed350361d375114616dcc (diff)
downloadATCD-d79c933df9aeef8418f6ec8af4d8ed8c969f72ab.tar.gz
added ACE_WIN32 check because it doesn't have ACE_HAS_LONGLONG_T defined
Diffstat (limited to 'ace/Profile_Timer.cpp')
-rw-r--r--ace/Profile_Timer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index f45fb050783..3cc4ff69a29 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -242,12 +242,12 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
ACE_hrtime_t delta_t; /* nanoseconds */
timer_.elapsed_time (delta_t);
-#if defined (ACE_HAS_LONGLONG_T)
+#if defined (ACE_WIN32) || defined (ACE_HAS_LONGLONG_T)
et.real_time = delta_t / 1000000000.0;
#else
et.real_time = (double) ULONG_MAX / 1000000000.0 * (double) delta_t.hi () +
(double) delta_t.lo () / 1000000000.0;
-#endif /* ACE_HAS_LONGLONG_T */
+#endif /* ACE_WIN32 || ACE_HAS_LONGLONG_T */
et.user_time = 0;
et.system_time = 0;