From ff11fd4c623cead9be88f7f36013a229bd64d78d Mon Sep 17 00:00:00 2001 From: David Webster Date: Fri, 21 Jul 2000 13:06:37 +0000 Subject: [PATCH] ftime enabled OS/2 code added by Guill.... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/timercmn.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp index d20e479d0e..e2aea3bb67 100644 --- a/src/common/timercmn.cpp +++ b/src/common/timercmn.cpp @@ -53,6 +53,11 @@ #define HAVE_FTIME #endif +#if defined(__VISAGECPP__) && !defined(HAVE_FTIME) + #define HAVE_FTIME + #define ftime(x) _ftime(x) +#endif + #include #ifndef __WXMAC__ #include // for time_t @@ -279,17 +284,8 @@ wxLongLong wxGetLocalTimeMillis() val *= wxGetLocalTime(); -#if defined(__VISAGECPP__) - // If your platform/compiler needs to use two different functions - // to get ms resolution, please do NOT just shut off these warnings, - // drop me a line instead at - // Visualage does not support #warning - // #warning "Possible clock skew bug in wxGetLocalTimeMillis()!" - - DATETIME dt; - ::DosGetDateTime(&dt); - val += (dt.hundredths*10); -#elif defined (__WIN32__) +// GRG: This will go soon as all WIN32 seem to have ftime +#if defined (__WIN32__) // If your platform/compiler needs to use two different functions // to get ms resolution, please do NOT just shut off these warnings, // drop me a line instead at