From 4a756a11f529c2f69227975b08eae59a0029fb65 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Thu, 6 Dec 2012 22:21:33 +0000
Subject: [PATCH] Minor changes to avoid compiler warnings

---
 motorApp/NewportSrc/XPSController.cpp | 21 +++++++++++----------
 motorApp/NewportSrc/XPSController.h   |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/motorApp/NewportSrc/XPSController.cpp b/motorApp/NewportSrc/XPSController.cpp
index f3b296a3..ee7db679 100644
--- a/motorApp/NewportSrc/XPSController.cpp
+++ b/motorApp/NewportSrc/XPSController.cpp
@@ -131,8 +131,12 @@ const static CorrectorTypes_t CorrectorTypes = {
 // Maximum number of bytes that GatheringDataMultipleLinesGet() can return
 #define GATHERING_MAX_READ_LEN 65536
 
+#ifndef MAX
 #define MAX(a,b) ((a)>(b)? (a): (b))
+#endif
+#ifndef MIN
 #define MIN(a,b) ((a)<(b)? (a): (b))
+#endif
 
 
 XPSController::XPSController(const char *portName, const char *IPAddress, int IPPort, 
@@ -144,7 +148,8 @@ XPSController::XPSController(const char *portName, const char *IPAddress, int IP
                          ASYN_CANBLOCK | ASYN_MULTIDEVICE, 
                          1, // autoconnect
                          0, 0),  // Default priority and stack size
-     enableSetPosition_(enableSetPosition), setPositionSettlingTime_(setPositionSettlingTime), 
+     enableSetPosition_((enableSetPosition!=0)?true:false), 
+     setPositionSettlingTime_(setPositionSettlingTime), 
      ftpUsername_(NULL), ftpPassword_(NULL)
 {
   static const char *functionName = "XPSController";
@@ -434,7 +439,7 @@ asynStatus XPSController::buildProfile()
   int nElements;
   double trajVel;
   double D0, D1, T0, T1;
-  int ftpSocket;
+  SOCKET ftpSocket;
   char fileName[MAX_FILENAME_LEN];
   char groupName[MAX_GROUPNAME_LEN];
   char message[MAX_MESSAGE_LEN];
@@ -1163,11 +1168,9 @@ asynStatus XPSCreateController(const char *portName, const char *IPAddress, int
                                int numAxes, int movingPollPeriod, int idlePollPeriod,
                                int enableSetPosition, int setPositionSettlingTime)
 {
-    XPSController *pXPSController
-        = new XPSController(portName, IPAddress, IPPort, numAxes, 
-                            movingPollPeriod/1000., idlePollPeriod/1000.,
-                            enableSetPosition, setPositionSettlingTime/1000.);
-    pXPSController = NULL;
+    new XPSController(portName, IPAddress, IPPort, numAxes, 
+                      movingPollPeriod/1000., idlePollPeriod/1000.,
+                      enableSetPosition, setPositionSettlingTime/1000.);
     return asynSuccess;
 }
 
@@ -1179,7 +1182,6 @@ asynStatus XPSCreateAxis(const char *XPSName,         /* specify which controlle
                          const char *stepsPerUnit)    /* steps per user unit */
 {
   XPSController *pC;
-  XPSAxis *pAxis;
   double stepSize;
   static const char *functionName = "XPSCreateAxis";
 
@@ -1198,8 +1200,7 @@ asynStatus XPSCreateAxis(const char *XPSName,         /* specify which controlle
   }
   
   pC->lock();
-  pAxis = new XPSAxis(pC, axis, positionerName, 1./stepSize);
-  pAxis = NULL;
+  new XPSAxis(pC, axis, positionerName, 1./stepSize);
   pC->unlock();
   return asynSuccess;
 }
diff --git a/motorApp/NewportSrc/XPSController.h b/motorApp/NewportSrc/XPSController.h
index bd56f7ff..92a3fa02 100644
--- a/motorApp/NewportSrc/XPSController.h
+++ b/motorApp/NewportSrc/XPSController.h
@@ -92,6 +92,6 @@ class XPSController : public asynMotorController {
   
   friend class XPSAxis;
 };
-#define NUM_XPS_PARAMS (&LAST_XPS_PARAM - &FIRST_XPS_PARAM + 1)
+#define NUM_XPS_PARAMS ((int)(&LAST_XPS_PARAM - &FIRST_XPS_PARAM + 1))
 #endif /* XPSController_H */