From f46aba74adc11b4b44238037f68c72cef2f7890a Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Thu, 28 Aug 2014 18:13:30 +0000
Subject: [PATCH] don't use variable named "time".  Conflicts with time().

---
 motorApp/OmsSrc/MAX_trajectoryScan.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/motorApp/OmsSrc/MAX_trajectoryScan.h b/motorApp/OmsSrc/MAX_trajectoryScan.h
index eda81704..f938e90d 100644
--- a/motorApp/OmsSrc/MAX_trajectoryScan.h
+++ b/motorApp/OmsSrc/MAX_trajectoryScan.h
@@ -53,8 +53,8 @@ monitor endPulses;
 int     nactual;     assign nactual      to "{P}{R}Nactual.VAL"; 
 int     moveMode;    assign moveMode     to "{P}{R}MoveMode.VAL";    
 monitor moveMode;
-double  time;        assign time         to "{P}{R}Time.VAL";      
-monitor time;
+double  time_PV;     assign time_PV      to "{P}{R}Time.VAL";      
+monitor time_PV;
 double  timeScale;   assign timeScale    to "{P}{R}TimeScale.VAL"; 
 monitor timeScale;
 int     timeMode;    assign timeMode     to "{P}{R}TimeMode.VAL";