From 496eeba54c11a31d833fc46b1d37febd4b5b3904 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Thu, 8 Dec 2005 00:08:40 +0000
Subject: [PATCH] Changed (int32_t) to (int) for Windows

---
 motorApp/FaulhaberSrc/drvMCDC2805.cc |  6 +++---
 motorApp/ImsSrc/drvIM483PL.cc        |  8 ++++----
 motorApp/ImsSrc/drvIM483SM.cc        | 10 +++++-----
 motorApp/ImsSrc/drvMDrive.cc         |  8 ++++----
 motorApp/NewportSrc/drvXPSC8.cc      |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/motorApp/FaulhaberSrc/drvMCDC2805.cc b/motorApp/FaulhaberSrc/drvMCDC2805.cc
index 92a56de0..1e66eb19 100644
--- a/motorApp/FaulhaberSrc/drvMCDC2805.cc
+++ b/motorApp/FaulhaberSrc/drvMCDC2805.cc
@@ -2,9 +2,9 @@
 FILENAME... drvMCDC2805.cc
 USAGE...    Motor record driver level support for Faulhaber MCDC2805
 
-Version:    $Revision: 1.2 $
+Version:    $Revision: 1.3 $
 Modified By:    $Author: rivers $
-Last Modified:  $Date: 2005-11-04 23:05:34 $
+Last Modified:  $Date: 2005-12-08 00:07:47 $
 */
 
 /*
@@ -337,7 +337,7 @@ static int set_status(int card, int signal)
     motor_info->encoder_position = 0;
     else
     {
-       motor_info->encoder_position = (int32_t) motorData;
+       motor_info->encoder_position = (int) motorData;
     }
 
     status.Bits.RA_PROBLEM  = 0;
diff --git a/motorApp/ImsSrc/drvIM483PL.cc b/motorApp/ImsSrc/drvIM483PL.cc
index 18c93069..dbc4cec2 100644
--- a/motorApp/ImsSrc/drvIM483PL.cc
+++ b/motorApp/ImsSrc/drvIM483PL.cc
@@ -3,9 +3,9 @@ FILENAME... drvIM483PL.cc
 USAGE...    Motor record driver level support for Intelligent Motion
         Systems, Inc. IM483(I/IE).
 
-Version:    $Revision: 1.15 $
-Modified By:    $Author: sluiter $
-Last Modified:  $Date: 2005-05-10 16:34:12 $
+Version:    $Revision: 1.16 $
+Modified By:    $Author: rivers $
+Last Modified:  $Date: 2005-12-08 00:08:40 $
 */
 
 /*****************************************************************
@@ -341,7 +341,7 @@ static int set_status(int card, int signal)
         send_mess(card, " z 0", IM483PL_axis[signal]);
         recv_mess(card, buff, 1);
         motorData = atof(&buff[5]);
-        motor_info->encoder_position = (int32_t) motorData;
+        motor_info->encoder_position = (int) motorData;
     }
 
     status.Bits.RA_PROBLEM  = 0;
diff --git a/motorApp/ImsSrc/drvIM483SM.cc b/motorApp/ImsSrc/drvIM483SM.cc
index ff7ea3f3..a6a0562c 100644
--- a/motorApp/ImsSrc/drvIM483SM.cc
+++ b/motorApp/ImsSrc/drvIM483SM.cc
@@ -3,9 +3,9 @@ FILENAME... drvIM483SM.cc
 USAGE...    Motor record driver level support for Intelligent Motion
         Systems, Inc. IM483(I/IE).
 
-Version:    $Revision: 1.16 $
-Modified By:    $Author: sluiter $
-Last Modified:  $Date: 2005-05-10 16:34:12 $
+Version:    $Revision: 1.17 $
+Modified By:    $Author: rivers $
+Last Modified:  $Date: 2005-12-08 00:08:40 $
 */
 
 /*****************************************************************
@@ -338,7 +338,7 @@ static int set_status(int card, int signal)
         send_mess(card, "z 0", (char) NULL);
         recv_mess(card, buff, 1);
         motorData = atof(&buff[5]);
-        motor_info->encoder_position = (int32_t) motorData;
+        motor_info->encoder_position = (int) motorData;
     }
 
     status.Bits.RA_PROBLEM  = 0;
@@ -513,7 +513,7 @@ static int motor_init()
     int card_index, motor_index;
     char buff[BUFF_SIZE];
     int total_axis = 0;
-    int status;
+    int status = 0;
     asynStatus success_rtn;
     static const char output_terminator[] = "\r";
     static const char input_terminator[] = "\r\n";
diff --git a/motorApp/ImsSrc/drvMDrive.cc b/motorApp/ImsSrc/drvMDrive.cc
index ed5d0a6e..b47b574f 100644
--- a/motorApp/ImsSrc/drvMDrive.cc
+++ b/motorApp/ImsSrc/drvMDrive.cc
@@ -3,9 +3,9 @@ FILENAME... drvMDrive.cc
 USAGE...    Motor record driver level support for Intelligent Motion
 	Systems, Inc. MDrive series; M17, M23, M34.
 
-Version:    $Revision: 1.19 $
-Modified By:    $Author: sluiter $
-Last Modified:  $Date: 2005-10-20 20:06:47 $
+Version:    $Revision: 1.20 $
+Modified By:    $Author: rivers $
+Last Modified:  $Date: 2005-12-08 00:08:40 $
 */
 
 /*
@@ -359,7 +359,7 @@ static int set_status(int card, int signal)
 	send_mess(card, "PR C2", MDrive_axis[signal]);
 	recv_mess(card, buff, 1);
 	motorData = atof(buff);
-	motor_info->encoder_position = (int32_t) motorData;
+	motor_info->encoder_position = (int) motorData;
     }
 
     status.Bits.RA_PROBLEM  = 0;
diff --git a/motorApp/NewportSrc/drvXPSC8.cc b/motorApp/NewportSrc/drvXPSC8.cc
index 0067ff48..bf0493f1 100755
--- a/motorApp/NewportSrc/drvXPSC8.cc
+++ b/motorApp/NewportSrc/drvXPSC8.cc
@@ -451,7 +451,7 @@ STATIC int set_status(int card, int signal)
     {
         motor_info->position = NINT(motorData);  
         if (motor_state[card]->motor_info[signal].encoder_present == YES)
-            motor_info->encoder_position = (int32_t) motorData;
+            motor_info->encoder_position = (int) motorData;
         else
             motor_info->encoder_position = 0;