From 2074b993425421cef4ebcc9e9ff7616d8852183a Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Wed, 23 Oct 2002 22:15:41 +0000
Subject: [PATCH] added constants

---
 src/libCom/fdmgr/fdManager.cpp | 7 +++++--
 src/libCom/fdmgr/fdmgr.cpp     | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/libCom/fdmgr/fdManager.cpp b/src/libCom/fdmgr/fdManager.cpp
index a75e6fb7d..671da128a 100644
--- a/src/libCom/fdmgr/fdManager.cpp
+++ b/src/libCom/fdmgr/fdManager.cpp
@@ -38,6 +38,9 @@
 
 epicsShareDef fdManager fileDescriptorManager;
 
+const unsigned mSecPerSec = 1000u;
+const unsigned uSecPerSec = 1000u * mSecPerSec;
+
 //
 // fdManager::fdManager()
 //
@@ -117,8 +120,8 @@ epicsShareFunc void fdManager::process (double delay)
         ++iter;
     }
 
-    tv.tv_sec = static_cast<long> (minDelay);
-    tv.tv_usec = static_cast<long> ((minDelay-tv.tv_sec)*epicsTime::uSecPerSec);
+    tv.tv_sec = static_cast<long> ( minDelay );
+    tv.tv_usec = static_cast<long> ( (minDelay-tv.tv_sec) * uSecPerSec );
 
     /*
      * win32 requires this (others will
diff --git a/src/libCom/fdmgr/fdmgr.cpp b/src/libCom/fdmgr/fdmgr.cpp
index 915474df3..eaed2ee02 100644
--- a/src/libCom/fdmgr/fdmgr.cpp
+++ b/src/libCom/fdmgr/fdmgr.cpp
@@ -31,6 +31,8 @@
  
 static const fdRegType fdiToFdRegType[] = {fdrRead, fdrWrite, fdrException};
 static const unsigned fdiToFdRegTypeNElements = sizeof (fdiToFdRegType) / sizeof (fdiToFdRegType[0]);
+const unsigned mSecPerSec = 1000u;
+const unsigned uSecPerSec = 1000u * mSecPerSec;
 
 class fdRegForOldFdmgr : public fdReg {
 public:
@@ -171,7 +173,7 @@ extern "C" epicsShareFunc fdctx * epicsShareAPI fdmgr_init (void)
 extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
     fdctx *pfdctx, struct timeval *ptimeout, pCallBackFDMgr pFunc, void *pParam)
 {
-    double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (epicsTime::uSecPerSec);
+    double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
     timerForOldFdmgr *pTimer;
     unsigned id = fdmgrNoAlarm;
@@ -298,7 +300,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361
 extern "C" epicsShareFunc int epicsShareAPI fdmgr_pend_event (fdctx *pfdctx, struct timeval *ptimeout)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
-    double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (epicsTime::uSecPerSec);
+    double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
 
     try {
         pfdm->process (delay);