From decde6bd61ac286eded69c2f44e0da140fbaf215 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 26 Aug 2008 20:31:09 +0000
Subject: [PATCH] Fix generalTime initialization issue.

---
 src/libCom/osi/os/WIN32/osdTime.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libCom/osi/os/WIN32/osdTime.cpp b/src/libCom/osi/os/WIN32/osdTime.cpp
index 43f17c423..e7ab2836e 100644
--- a/src/libCom/osi/os/WIN32/osdTime.cpp
+++ b/src/libCom/osi/os/WIN32/osdTime.cpp
@@ -20,6 +20,7 @@
 #include <math.h>
 #include <time.h>
 #include <limits.h>
+#include <stdio.h>
 
 //
 // WIN32
@@ -96,8 +97,11 @@ static const LONGLONG ET_TICKS_PER_FT_TICK =
 static int timeRegister(void)
 {
     pCurrentTime = new currentTime ();
-    pCurrentTime->startPLL ();
+    /* Must register with generalTime here since the epicsTimer
+     * in the PLL ends up calling epicsTime::getCurrent()
+     */
     generalTimeCurrentTpRegister("PerfCounter", 150, osdTimeGetCurrent);
+    pCurrentTime->startPLL ();
     return 1;
 }
 static int done = timeRegister();