From b2bd2137002718220073607c064ef82df6ac67a4 Mon Sep 17 00:00:00 2001 From: coryan Date: Sat, 14 Apr 2001 01:13:03 +0000 Subject: ChangeLogTag:Fri Apr 13 11:58:58 2001 Carlos O'Ryan --- ChangeLog | 6 ++++++ ChangeLogs/ChangeLog-02a | 6 ++++++ ChangeLogs/ChangeLog-03a | 6 ++++++ ace/OS.i | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a98e5873cac..63e7194ce8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 13 11:58:58 2001 Carlos O'Ryan + + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. + Fri Apr 13 12:21:01 2001 Nanbor Wang * ace/Malloc_T.h: Added an explanation on the requirement about diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a98e5873cac..63e7194ce8b 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Apr 13 11:58:58 2001 Carlos O'Ryan + + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. + Fri Apr 13 12:21:01 2001 Nanbor Wang * ace/Malloc_T.h: Added an explanation on the requirement about diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a98e5873cac..63e7194ce8b 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Apr 13 11:58:58 2001 Carlos O'Ryan + + * ace/OS.i (gethrtime): + Add support for the the clock tick register as a high resolution + timer under KCC/Linux. + Fri Apr 13 12:21:01 2001 Nanbor Wang * ace/Malloc_T.h: Added an explanation on the requirement about diff --git a/ace/OS.i b/ace/OS.i index f4b8b885151..128cf72b141 100644 --- a/ace/OS.i +++ b/ace/OS.i @@ -10558,7 +10558,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) ACE_UNUSED_ARG (op); // Use .obj/gethrtime.o, which was compiled with g++. return ACE_gethrtime (); -#elif defined (__GNUG__) && defined (ACE_HAS_PENTIUM) +#elif (defined(__KCC) || defined (__GNUG__)) && defined (ACE_HAS_PENTIUM) ACE_UNUSED_ARG (op); # if defined (ACE_LACKS_LONGLONG_T) -- cgit v1.2.1