From aa99a2556cf598f6f783afa5117bfc8c35a3602c Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Mon, 20 Dec 2004 21:12:51 +0000 Subject: [PATCH] MicroSoft Visual C compiler compatibility. --- motorApp/AcsSrc/devMCB4B.cc | 2 +- motorApp/AcsSrc/drvMCB4B.cc | 2 +- motorApp/DeltaTauSrc/devPmac.cc | 6 +++--- motorApp/ImsSrc/devIM483PL.cc | 6 +++--- motorApp/ImsSrc/devIM483SM.cc | 6 +++--- motorApp/ImsSrc/devMDrive.cc | 6 +++--- motorApp/MXmotorSrc/devMXmotor.cc | 6 +++--- motorApp/MXmotorSrc/drvMXmotor.cc | 6 +++--- motorApp/MclennanSrc/devPM304.cc | 2 +- motorApp/MclennanSrc/drvPM304.cc | 2 +- motorApp/MicosSrc/devMicos.cc | 2 +- motorApp/MicroMoSrc/devMVP2001.cc | 6 +++--- motorApp/NewportSrc/devESP300.cc | 6 +++--- motorApp/NewportSrc/devMM3000.cc | 6 +++--- motorApp/NewportSrc/devMM4000.cc | 6 +++--- motorApp/NewportSrc/devPM500.cc | 6 +++--- motorApp/OmsSrc/devMAXv.cc | 6 +++--- motorApp/OmsSrc/devOms.cc | 6 +++--- motorApp/OmsSrc/devOms58.cc | 6 +++--- motorApp/PiSrc/devPIC844.cc | 6 +++--- 20 files changed, 50 insertions(+), 50 deletions(-) diff --git a/motorApp/AcsSrc/devMCB4B.cc b/motorApp/AcsSrc/devMCB4B.cc index 8bf295af..77617b03 100644 --- a/motorApp/AcsSrc/devMCB4B.cc +++ b/motorApp/AcsSrc/devMCB4B.cc @@ -66,7 +66,7 @@ struct motor_dset devMCB4B = MCB4B_end_trans }; -epicsExportAddress(dset,devMCB4B); +extern "C" {epicsExportAddress(dset,devMCB4B);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/AcsSrc/drvMCB4B.cc b/motorApp/AcsSrc/drvMCB4B.cc index b6442cfb..8354bfcf 100644 --- a/motorApp/AcsSrc/drvMCB4B.cc +++ b/motorApp/AcsSrc/drvMCB4B.cc @@ -110,7 +110,7 @@ struct #endif } drvMCB4B = {2, report, init}; -epicsExportAddress(drvet, drvMCB4B); +extern "C" {epicsExportAddress(drvet, drvMCB4B);} STATIC struct thread_args targs = {SCAN_RATE, &MCB4B_access}; diff --git a/motorApp/DeltaTauSrc/devPmac.cc b/motorApp/DeltaTauSrc/devPmac.cc index 19953f8c..4d6c1f80 100644 --- a/motorApp/DeltaTauSrc/devPmac.cc +++ b/motorApp/DeltaTauSrc/devPmac.cc @@ -2,9 +2,9 @@ FILENAME... devPmac.cc USAGE... Device level support for Delta Tau PMAC. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-10-07 15:04:58 $ +Last Modified: $Date: 2004-12-20 21:05:19 $ */ /* @@ -67,7 +67,7 @@ struct motor_dset devPmac = Pmac_end_trans }; -epicsExportAddress(dset,devPmac); +extern "C" {epicsExportAddress(dset,devPmac);} /* This table is used to define the command types */ /* WARNING! this must match "motor_cmnd" in motor.h */ diff --git a/motorApp/ImsSrc/devIM483PL.cc b/motorApp/ImsSrc/devIM483PL.cc index 4a8baecf..969ab371 100644 --- a/motorApp/ImsSrc/devIM483PL.cc +++ b/motorApp/ImsSrc/devIM483PL.cc @@ -3,9 +3,9 @@ FILENAME... devIM483PL.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-09-20 20:54:43 $ +Last Modified: $Date: 2004-12-20 21:06:43 $ */ /* @@ -71,7 +71,7 @@ struct motor_dset devIM483PL = IM483PL_end_trans }; -epicsExportAddress(dset,devIM483PL); +extern "C" {epicsExportAddress(dset,devIM483PL);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/ImsSrc/devIM483SM.cc b/motorApp/ImsSrc/devIM483SM.cc index a0b46e8e..cf23d9b6 100644 --- a/motorApp/ImsSrc/devIM483SM.cc +++ b/motorApp/ImsSrc/devIM483SM.cc @@ -3,9 +3,9 @@ FILENAME... devIM483SM.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-19 17:08:26 $ +Last Modified: $Date: 2004-12-20 21:06:43 $ */ /* @@ -71,7 +71,7 @@ struct motor_dset devIM483SM = IM483SM_end_trans }; -epicsExportAddress(dset,devIM483SM); +extern "C" {epicsExportAddress(dset,devIM483SM);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/ImsSrc/devMDrive.cc b/motorApp/ImsSrc/devMDrive.cc index 6e3e4399..7aa794e9 100644 --- a/motorApp/ImsSrc/devMDrive.cc +++ b/motorApp/ImsSrc/devMDrive.cc @@ -3,9 +3,9 @@ FILENAME... devMDrive.cc USAGE... Motor record device level support for Intelligent Motion Systems, Inc. MDrive series of controllers. -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-09-20 20:57:05 $ +Last Modified: $Date: 2004-12-20 21:06:43 $ */ /* @@ -72,7 +72,7 @@ struct motor_dset devMDrive = MDrive_end_trans }; -epicsExportAddress(dset,devMDrive); +extern "C" {epicsExportAddress(dset,devMDrive);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/MXmotorSrc/devMXmotor.cc b/motorApp/MXmotorSrc/devMXmotor.cc index bbfcdf38..b13f8e7d 100644 --- a/motorApp/MXmotorSrc/devMXmotor.cc +++ b/motorApp/MXmotorSrc/devMXmotor.cc @@ -2,9 +2,9 @@ FILENAME... devMXmotor.cc USAGE... Motor record device level support for MX device driver. -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-19 17:35:18 $ +Last Modified: $Date: 2004-12-20 21:07:26 $ */ /* @@ -54,7 +54,7 @@ struct motor_dset devMXmotor = MXmotor_end_trans }; -epicsExportAddress(dset,devMXmotor); +extern "C" {epicsExportAddress(dset,devMXmotor);} /* This table is used to define the command types */ diff --git a/motorApp/MXmotorSrc/drvMXmotor.cc b/motorApp/MXmotorSrc/drvMXmotor.cc index 9ee4cd70..edc92450 100644 --- a/motorApp/MXmotorSrc/drvMXmotor.cc +++ b/motorApp/MXmotorSrc/drvMXmotor.cc @@ -2,9 +2,9 @@ FILENAME... drvMXmotor.cc USAGE... Motor record driver level support for MX device driver. -Version: $Revision: 1.6 $ +Version: $Revision: 1.7 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-09-20 21:10:56 $ +Last Modified: $Date: 2004-12-20 21:07:26 $ */ /* @@ -95,7 +95,7 @@ struct long (*init) (void); } drvMXmotor = {2, report, init}; -epicsExportAddress(drvet,drvMXmotor); +extern "C" {epicsExportAddress(drvet,drvMXmotor);} static struct thread_args targs = {SCAN_RATE, &MXmotor_access}; diff --git a/motorApp/MclennanSrc/devPM304.cc b/motorApp/MclennanSrc/devPM304.cc index 033de564..bc526893 100644 --- a/motorApp/MclennanSrc/devPM304.cc +++ b/motorApp/MclennanSrc/devPM304.cc @@ -75,7 +75,7 @@ struct motor_dset devPM304 = PM304_end_trans }; -epicsExportAddress(dset,devPM304); +extern "C" {epicsExportAddress(dset,devPM304);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/MclennanSrc/drvPM304.cc b/motorApp/MclennanSrc/drvPM304.cc index 3f12da59..4129d714 100644 --- a/motorApp/MclennanSrc/drvPM304.cc +++ b/motorApp/MclennanSrc/drvPM304.cc @@ -133,7 +133,7 @@ struct #endif } drvPM304 = {2, report, init}; -epicsExportAddress(drvet, drvPM304); +extern "C" {epicsExportAddress(drvet, drvPM304);} STATIC struct thread_args targs = {SCAN_RATE, &PM304_access}; diff --git a/motorApp/MicosSrc/devMicos.cc b/motorApp/MicosSrc/devMicos.cc index 0698cb82..69464b17 100644 --- a/motorApp/MicosSrc/devMicos.cc +++ b/motorApp/MicosSrc/devMicos.cc @@ -58,7 +58,7 @@ struct motor_dset devMicos = Micos_end_trans }; -epicsExportAddress(dset,devMicos); +extern "C" {epicsExportAddress(dset,devMicos);} /* --------------------------- program data --------------------- */ /* This table is used to define the command types */ diff --git a/motorApp/MicroMoSrc/devMVP2001.cc b/motorApp/MicroMoSrc/devMVP2001.cc index 6824cee3..fe7452e0 100644 --- a/motorApp/MicroMoSrc/devMVP2001.cc +++ b/motorApp/MicroMoSrc/devMVP2001.cc @@ -3,9 +3,9 @@ FILENAME... devMVP2001.cc USAGE... Motor record device level support for MicroMo MVP 2001 B02 (Linear, RS-485). -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-03-03 20:02:57 $ +Last Modified: $Date: 2004-12-20 21:09:09 $ */ /* @@ -116,7 +116,7 @@ struct motor_dset devMVP2001 = MVP2001_end_trans }; -epicsExportAddress(dset,devMVP2001); +extern "C" {epicsExportAddress(dset,devMVP2001);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/NewportSrc/devESP300.cc b/motorApp/NewportSrc/devESP300.cc index fb204224..c49d4c21 100644 --- a/motorApp/NewportSrc/devESP300.cc +++ b/motorApp/NewportSrc/devESP300.cc @@ -2,9 +2,9 @@ FILENAME... devESP300.cc USAGE... Motor record device level support for Newport ESP300. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-11-04 15:49:01 $ +Last Modified: $Date: 2004-12-20 21:10:53 $ */ /* @@ -67,7 +67,7 @@ struct motor_dset devESP300 = ESP300_end_trans }; -epicsExportAddress(dset,devESP300); +extern "C" {epicsExportAddress(dset,devESP300);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/NewportSrc/devMM3000.cc b/motorApp/NewportSrc/devMM3000.cc index 4458124f..996c3ecf 100644 --- a/motorApp/NewportSrc/devMM3000.cc +++ b/motorApp/NewportSrc/devMM3000.cc @@ -2,9 +2,9 @@ FILENAME... devMM3000.cc USAGE... Motor record device level support for Newport MM3000. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-23 16:05:25 $ +Last Modified: $Date: 2004-12-20 21:10:53 $ */ /* @@ -71,7 +71,7 @@ struct motor_dset devMM3000 = MM3000_end_trans }; -epicsExportAddress(dset,devMM3000); +extern "C" {epicsExportAddress(dset,devMM3000);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/NewportSrc/devMM4000.cc b/motorApp/NewportSrc/devMM4000.cc index 47b0315d..063b39c7 100644 --- a/motorApp/NewportSrc/devMM4000.cc +++ b/motorApp/NewportSrc/devMM4000.cc @@ -2,9 +2,9 @@ FILENAME... devMM4000.cc USAGE... Motor record device level support for Newport MM4000. -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-23 16:06:25 $ +Last Modified: $Date: 2004-12-20 21:10:53 $ */ /* @@ -73,7 +73,7 @@ struct motor_dset devMM4000 = MM4000_end_trans }; -epicsExportAddress(dset,devMM4000); +extern "C" {epicsExportAddress(dset,devMM4000);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/NewportSrc/devPM500.cc b/motorApp/NewportSrc/devPM500.cc index 1527fa30..86e82cb5 100644 --- a/motorApp/NewportSrc/devPM500.cc +++ b/motorApp/NewportSrc/devPM500.cc @@ -3,9 +3,9 @@ FILENAME... devPM500.cc USAGE... Motor record device level support for the Newport PM500 motor controller. -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-05-23 16:01:52 $ +Last Modified: $Date: 2004-12-20 21:10:53 $ */ /* @@ -73,7 +73,7 @@ struct motor_dset devPM500 = PM500_end_trans }; -epicsExportAddress(dset,devPM500); +extern "C" {epicsExportAddress(dset,devPM500);} /* --------------------------- program data --------------------- */ diff --git a/motorApp/OmsSrc/devMAXv.cc b/motorApp/OmsSrc/devMAXv.cc index ff7e12cf..d2898b01 100644 --- a/motorApp/OmsSrc/devMAXv.cc +++ b/motorApp/OmsSrc/devMAXv.cc @@ -2,9 +2,9 @@ FILENAME... devMAXV.cc USAGE... Device level support for OMS MAXv model. -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-06-21 21:42:30 $ +Last Modified: $Date: 2004-12-20 21:11:53 $ */ /* @@ -60,7 +60,7 @@ struct motor_dset devMAXv = MAXv_end_trans }; -epicsExportAddress(dset,devMAXv); +extern "C" {epicsExportAddress(dset,devMAXv);} static struct board_stat **MAXv_cards; static const char errmsg[] = {"\n\n!!!ERROR!!! - Oms MAXv driver uninitialized.\n"}; diff --git a/motorApp/OmsSrc/devOms.cc b/motorApp/OmsSrc/devOms.cc index 29551b64..db5c0090 100644 --- a/motorApp/OmsSrc/devOms.cc +++ b/motorApp/OmsSrc/devOms.cc @@ -2,9 +2,9 @@ FILENAME... devOms.cc USAGE... Device level support for OMS VME8 and VME44 models. -Version: $Revision: 1.5 $ +Version: $Revision: 1.6 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-06-21 21:44:09 $ +Last Modified: $Date: 2004-12-20 21:11:53 $ */ /* @@ -81,7 +81,7 @@ struct motor_dset devOMS = oms_end_trans }; -epicsExportAddress(dset,devOMS); +extern "C" {epicsExportAddress(dset,devOMS);} STATIC struct board_stat **oms_cards; STATIC const char errmsg[] = {"\n\n!!!ERROR!!! - Oms driver uninitialized.\n"}; diff --git a/motorApp/OmsSrc/devOms58.cc b/motorApp/OmsSrc/devOms58.cc index 04ada24d..83bf5375 100644 --- a/motorApp/OmsSrc/devOms58.cc +++ b/motorApp/OmsSrc/devOms58.cc @@ -2,9 +2,9 @@ FILENAME... devOms58.c USAGE... Motor record device level support for OMS VME58. -Version: $Revision: 1.4 $ +Version: $Revision: 1.5 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2003-06-16 15:04:11 $ +Last Modified: $Date: 2004-12-20 21:11:53 $ */ /* @@ -81,7 +81,7 @@ struct motor_dset devOms58 = oms_end_trans }; -epicsExportAddress(dset,devOms58); +extern "C" {epicsExportAddress(dset,devOms58);} STATIC struct board_stat **oms_cards; STATIC const char errmsg[] = {"\n\n!!!ERROR!!! - Oms58 driver uninitialized.\n"}; diff --git a/motorApp/PiSrc/devPIC844.cc b/motorApp/PiSrc/devPIC844.cc index bf049d58..0fe8c173 100644 --- a/motorApp/PiSrc/devPIC844.cc +++ b/motorApp/PiSrc/devPIC844.cc @@ -3,9 +3,9 @@ FILENAME... devPIC844.cc USAGE... Motor record device level support for Physik Instrumente (PI) GmbH & Co. C-844 motor controller. -Version: $Revision: 1.3 $ +Version: $Revision: 1.4 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-01-22 22:09:56 $ +Last Modified: $Date: 2004-12-20 21:12:51 $ */ /* @@ -66,7 +66,7 @@ struct motor_dset devPIC844 = PIC844_end_trans }; -epicsExportAddress(dset,devPIC844); +extern "C" {epicsExportAddress(dset,devPIC844);} /* --------------------------- program data --------------------- */