From b02b1cf8bad98350d12c2c6719cabd74f1addf41 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Mon, 18 Feb 2013 20:19:20 +0000 Subject: [PATCH] Changed order of including files so that epicsExport.h is effectively last; needed for dynamic builds on WIN32; change some debugging code so all variables are defined in Debug statements, needed on WIN32 --- motorApp/OmsAsynSrc/omsMAXv.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/motorApp/OmsAsynSrc/omsMAXv.cpp b/motorApp/OmsAsynSrc/omsMAXv.cpp index ada5a584..2894286d 100644 --- a/motorApp/OmsAsynSrc/omsMAXv.cpp +++ b/motorApp/OmsAsynSrc/omsMAXv.cpp @@ -18,10 +18,10 @@ HeadURL: $URL$ #include #include -#include "omsMAXv.h" #include "asynOctetSyncIO.h" #include #include +#include "omsMAXv.h" static const char *driverName = "omsMAXvDriver"; @@ -300,10 +300,10 @@ asynStatus omsMAXv::sendOnly(const char *outputBuff) // flush cards response Buffer #ifdef DEBUG int deltaIndex = ((epicsUInt16)pmotor->inPutIndex) - ((epicsUInt16)pmotor->inGetIndex); -#endif Debug(32, "%s:%s:%s: flushing %d characters\n", driverName, functionName, portName, (((deltaIndex < 0) ? BUFFER_SIZE + deltaIndex : deltaIndex))); +#endif putIndex = (epicsUInt16) pmotor->inPutIndex; pmotor->inGetIndex = putIndex; pmotor->status1_flag.Bits.text_response = 0; @@ -359,9 +359,7 @@ asynStatus omsMAXv::sendOnly(const char *outputBuff) */ asynStatus omsMAXv::sendReceive(const char *outputBuff, char *inputBuff, unsigned int inputSize) { -#ifdef DEBUG - const char* functionName = "sendReceive"; -#endif + static const char* functionName = "sendReceive"; STATUS1 flag1; epicsUInt16 getIndex, putIndex;