diff --git a/DeviceAdapters/AAAOTF/AAAOTF.cpp b/DeviceAdapters/AAAOTF/AAAOTF.cpp index 31a6491d8..5cae883fc 100644 --- a/DeviceAdapters/AAAOTF/AAAOTF.cpp +++ b/DeviceAdapters/AAAOTF/AAAOTF.cpp @@ -11,7 +11,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "AAAOTF.h" #include diff --git a/DeviceAdapters/ABS/ABSCamera.h b/DeviceAdapters/ABS/ABSCamera.h index d84b50c50..702dc0428 100644 --- a/DeviceAdapters/ABS/ABSCamera.h +++ b/DeviceAdapters/ABS/ABSCamera.h @@ -6,7 +6,6 @@ #include #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "FixSnprintf.h" #include "MMDevice.h" #include "MMDeviceConstants.h" diff --git a/DeviceAdapters/ABS/CcmFileStd.cpp b/DeviceAdapters/ABS/CcmFileStd.cpp index a7bd4f1e8..a6ea7e4cb 100644 --- a/DeviceAdapters/ABS/CcmFileStd.cpp +++ b/DeviceAdapters/ABS/CcmFileStd.cpp @@ -26,7 +26,6 @@ #include #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "FixSnprintf.h" #include "ccmfilestd.h" #include "memoryinifile.h" diff --git a/DeviceAdapters/ABS/TimeSpanPC.h b/DeviceAdapters/ABS/TimeSpanPC.h index 4322b736a..ed4665b49 100644 --- a/DeviceAdapters/ABS/TimeSpanPC.h +++ b/DeviceAdapters/ABS/TimeSpanPC.h @@ -5,7 +5,6 @@ #include #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "FixSnprintf.h" class CTimeSpanPC { diff --git a/DeviceAdapters/ABS/absdelayloaddll.cpp b/DeviceAdapters/ABS/absdelayloaddll.cpp index 831d4d79c..d29e6a673 100644 --- a/DeviceAdapters/ABS/absdelayloaddll.cpp +++ b/DeviceAdapters/ABS/absdelayloaddll.cpp @@ -3,7 +3,6 @@ #include #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows #endif -#include "FixSnprintf.h" #include #include "delayimp.h" #include "ABSDelayLoadDll.h" diff --git a/DeviceAdapters/AOTF/AOTF.cpp b/DeviceAdapters/AOTF/AOTF.cpp index 3c8060023..a0ef4c99c 100644 --- a/DeviceAdapters/AOTF/AOTF.cpp +++ b/DeviceAdapters/AOTF/AOTF.cpp @@ -29,7 +29,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "AOTF.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/ASIWPTR/wptr.cpp b/DeviceAdapters/ASIWPTR/wptr.cpp index 956c5107e..85cbd0717 100644 --- a/DeviceAdapters/ASIWPTR/wptr.cpp +++ b/DeviceAdapters/ASIWPTR/wptr.cpp @@ -23,8 +23,6 @@ // AUTHOR: Vikram Kopuri, based on Code by Nenad Amodaj Nico Stuurman and Jizhen Zhao // -#include "FixSnprintf.h" - #include "wptr.h" #include #include diff --git a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp index eff4f4b20..8de77634e 100644 --- a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp +++ b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp @@ -14,7 +14,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "AgilentLaserCombiner.h" #include "LaserCombinerSDK.h" diff --git a/DeviceAdapters/Aladdin/Aladdin.cpp b/DeviceAdapters/Aladdin/Aladdin.cpp index 8366bc7ec..a10277ede 100644 --- a/DeviceAdapters/Aladdin/Aladdin.cpp +++ b/DeviceAdapters/Aladdin/Aladdin.cpp @@ -27,7 +27,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "MMDevice.h" diff --git a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp index 657a59991..8a6b9f433 100644 --- a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp +++ b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.cpp @@ -30,8 +30,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - // Declarations for the ALC library. #include "ALC_REV.h" diff --git a/DeviceAdapters/Arduino/Arduino.cpp b/DeviceAdapters/Arduino/Arduino.cpp index 71fc4c419..57d10fb35 100644 --- a/DeviceAdapters/Arduino/Arduino.cpp +++ b/DeviceAdapters/Arduino/Arduino.cpp @@ -21,7 +21,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" const char* g_DeviceNameArduinoHub = "Arduino-Hub"; const char* g_DeviceNameArduinoSwitch = "Arduino-Switch"; diff --git a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp index 5e59da4ee..7bf57abdd 100644 --- a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp +++ b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.cpp @@ -32,7 +32,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" const char* g_DeviceNameArduino32Hub = "Arduino32-Hub"; const char* g_DeviceNameArduino32Switch = "Arduino32-Switch"; diff --git a/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp b/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp index b32c97f9e..214515183 100644 --- a/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp +++ b/DeviceAdapters/ArduinoCounter/ArduinoCounter.cpp @@ -19,7 +19,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" const char* g_DeviceNameArduinoCounterCamera = "ArduinoCounterCamera"; diff --git a/DeviceAdapters/BlueboxOptics_niji/niji.cpp b/DeviceAdapters/BlueboxOptics_niji/niji.cpp index 91b782b5e..700998689 100644 --- a/DeviceAdapters/BlueboxOptics_niji/niji.cpp +++ b/DeviceAdapters/BlueboxOptics_niji/niji.cpp @@ -29,8 +29,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/CARVII/CARVII.cpp b/DeviceAdapters/CARVII/CARVII.cpp index 4de34e914..baf5d1254 100644 --- a/DeviceAdapters/CARVII/CARVII.cpp +++ b/DeviceAdapters/CARVII/CARVII.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CARVII.h" #include "CARVIIHub.h" diff --git a/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixelShutter.cpp b/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixelShutter.cpp index d880e6d99..76b40e2cd 100644 --- a/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixelShutter.cpp +++ b/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixelShutter.cpp @@ -25,7 +25,6 @@ limitations under the License. #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" const char* g_DeviceNameArduinoNeoPixelHub = "ArduinoNeoPixel-Hub"; const char* g_DeviceNameArduinoNeoPixelShutter = "ArduinoNeoPixel-Shutter"; diff --git a/DeviceAdapters/CSUW1/CSUW1.cpp b/DeviceAdapters/CSUW1/CSUW1.cpp index 653e4540f..7c72d929f 100644 --- a/DeviceAdapters/CSUW1/CSUW1.cpp +++ b/DeviceAdapters/CSUW1/CSUW1.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CSUW1.h" #include "CSUW1Hub.h" diff --git a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.cpp b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.cpp index 12daf7bc5..5968dc0c0 100644 --- a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.cpp +++ b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD_XYZ.cpp @@ -30,7 +30,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ChuoSeiki_MD_XYZ.h" diff --git a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp index 19b02f2ef..826d0350e 100644 --- a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp +++ b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT_XYZ.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ChuoSeiki_QT_XYZ.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/CoherentCube/CoherentCube.cpp b/DeviceAdapters/CoherentCube/CoherentCube.cpp index 0862d650f..bb1536e34 100644 --- a/DeviceAdapters/CoherentCube/CoherentCube.cpp +++ b/DeviceAdapters/CoherentCube/CoherentCube.cpp @@ -22,13 +22,9 @@ // CVS: // - - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "CoherentCube.h" diff --git a/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp b/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp index 8fbd898dd..7c3353de1 100644 --- a/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp +++ b/DeviceAdapters/CoherentOBIS/CoherentOBIS.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CoherentOBIS.h" diff --git a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp index ed775bebb..d52f52fce 100644 --- a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp +++ b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.cpp @@ -26,7 +26,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CoherentScientificRemote.h" diff --git a/DeviceAdapters/Conix/Conix.cpp b/DeviceAdapters/Conix/Conix.cpp index f95896825..bd7469c57 100644 --- a/DeviceAdapters/Conix/Conix.cpp +++ b/DeviceAdapters/Conix/Conix.cpp @@ -15,7 +15,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Conix.h" #include diff --git a/DeviceAdapters/CoolLEDpE300/pE300.cpp b/DeviceAdapters/CoolLEDpE300/pE300.cpp index 8ecdd2665..af10e36a3 100644 --- a/DeviceAdapters/CoolLEDpE300/pE300.cpp +++ b/DeviceAdapters/CoolLEDpE300/pE300.cpp @@ -21,8 +21,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "pE300.h" diff --git a/DeviceAdapters/CoolLEDpE4000/pE4000.cpp b/DeviceAdapters/CoolLEDpE4000/pE4000.cpp index 7c40b1957..ec54823bb 100644 --- a/DeviceAdapters/CoolLEDpE4000/pE4000.cpp +++ b/DeviceAdapters/CoolLEDpE4000/pE4000.cpp @@ -21,8 +21,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "pE4000.h" diff --git a/DeviceAdapters/Corvus/Corvus.cpp b/DeviceAdapters/Corvus/Corvus.cpp index 29f7f4311..4068cac23 100644 --- a/DeviceAdapters/Corvus/Corvus.cpp +++ b/DeviceAdapters/Corvus/Corvus.cpp @@ -37,8 +37,6 @@ // "st" gives 8bit value. bit 0 tells if ready to execute; busy if "1" -#include "FixSnprintf.h" - #include #include #include diff --git a/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp b/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp index 1f1201ac3..6fc4adbda 100644 --- a/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp +++ b/DeviceAdapters/DTOpenLayer/DTOpenLayer.cpp @@ -24,7 +24,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "DTOpenLayer.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Diskovery/Diskovery.cpp b/DeviceAdapters/Diskovery/Diskovery.cpp index 828b66e38..1d6fe660e 100644 --- a/DeviceAdapters/Diskovery/Diskovery.cpp +++ b/DeviceAdapters/Diskovery/Diskovery.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Diskovery.h" #include diff --git a/DeviceAdapters/Diskovery/DiskoveryModel.cpp b/DeviceAdapters/Diskovery/DiskoveryModel.cpp index 005e0d74d..bd1048ccb 100644 --- a/DeviceAdapters/Diskovery/DiskoveryModel.cpp +++ b/DeviceAdapters/Diskovery/DiskoveryModel.cpp @@ -21,12 +21,9 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "DiskoveryModel.h" #include "Diskovery.h" diff --git a/DeviceAdapters/FLICamera/FLICamera.cpp b/DeviceAdapters/FLICamera/FLICamera.cpp index 2569943d9..65a1f3e31 100644 --- a/DeviceAdapters/FLICamera/FLICamera.cpp +++ b/DeviceAdapters/FLICamera/FLICamera.cpp @@ -25,7 +25,6 @@ #define WIN32_LEAN_AND_MEAN #include -#include "FixSnprintf.h" extern "C" { long __stdcall FLILibAttach(void); diff --git a/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp b/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp index ad737ea4a..5326f442a 100644 --- a/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp +++ b/DeviceAdapters/FreeSerialPort/FreeSerialPort.cpp @@ -25,7 +25,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "FreeSerialPort.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/HamiltonMVP/MVPCommands.h b/DeviceAdapters/HamiltonMVP/MVPCommands.h index 056a5006c..c1746e5df 100644 --- a/DeviceAdapters/HamiltonMVP/MVPCommands.h +++ b/DeviceAdapters/HamiltonMVP/MVPCommands.h @@ -41,9 +41,6 @@ #include #include -#include "FixSnprintf.h" - - const char* const MVP_TERM = "\r"; const char MVP_ACK = 6; const char MVP_NAK = 21; diff --git a/DeviceAdapters/HydraLMT200/ITKHydra.cpp b/DeviceAdapters/HydraLMT200/ITKHydra.cpp index 312ee6235..4178b449a 100644 --- a/DeviceAdapters/HydraLMT200/ITKHydra.cpp +++ b/DeviceAdapters/HydraLMT200/ITKHydra.cpp @@ -35,8 +35,6 @@ //TODO: NEED TO MAKE SURE COMMENDS SEND IN CR + LFKE SURE COMMENDS SEND IN CR + LF -#include "FixSnprintf.h" - #include #include #include diff --git a/DeviceAdapters/ITC18/MMITC18.cpp b/DeviceAdapters/ITC18/MMITC18.cpp index 8f4260880..ff8015b4b 100644 --- a/DeviceAdapters/ITC18/MMITC18.cpp +++ b/DeviceAdapters/ITC18/MMITC18.cpp @@ -15,7 +15,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "MMITC18.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp b/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp index a7e5cab9a..6e24ece37 100644 --- a/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp +++ b/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp @@ -31,8 +31,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" - int LedArray::Initialize() { diff --git a/DeviceAdapters/IsmatecMCP/MCPCommands.h b/DeviceAdapters/IsmatecMCP/MCPCommands.h index ee911a706..f30321e19 100644 --- a/DeviceAdapters/IsmatecMCP/MCPCommands.h +++ b/DeviceAdapters/IsmatecMCP/MCPCommands.h @@ -39,9 +39,6 @@ #include #include -#include "FixSnprintf.h" - - const char* const MCP_CMD_TERM = "\r"; const char* const MCP_RESP_TERM = "\r\n"; diff --git a/DeviceAdapters/K8055/K8055.cpp b/DeviceAdapters/K8055/K8055.cpp index 5d9b3406a..5aa67f270 100644 --- a/DeviceAdapters/K8055/K8055.cpp +++ b/DeviceAdapters/K8055/K8055.cpp @@ -18,7 +18,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" using namespace std; diff --git a/DeviceAdapters/K8061/K8061.cpp b/DeviceAdapters/K8061/K8061.cpp index d4a648af3..bc18a7a3f 100644 --- a/DeviceAdapters/K8061/K8061.cpp +++ b/DeviceAdapters/K8061/K8061.cpp @@ -19,7 +19,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" using namespace std; diff --git a/DeviceAdapters/LeicaDMI/LeicaDMI.cpp b/DeviceAdapters/LeicaDMI/LeicaDMI.cpp index 95016c230..bb0f50087 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMI.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMI.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "LeicaDMI.h" #include "LeicaDMIModel.h" diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp b/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp index a6fd45b7d..f1a94d3ca 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMIModel.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "LeicaDMIModel.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp index beb9e3391..89db1cbde 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp +++ b/DeviceAdapters/LeicaDMI/LeicaDMIScopeInterface.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "LeicaDMIScopeInterface.h" #include "LeicaDMIModel.h" diff --git a/DeviceAdapters/LeicaDMR/LeicaDMR.cpp b/DeviceAdapters/LeicaDMR/LeicaDMR.cpp index 19c50f46f..4356fad06 100644 --- a/DeviceAdapters/LeicaDMR/LeicaDMR.cpp +++ b/DeviceAdapters/LeicaDMR/LeicaDMR.cpp @@ -26,8 +26,6 @@ // AUTHOR: Nico Stuurman (based on code by Nenad Amodaj), nico@cmp.ucsf.edu, April 2007 // -#include "FixSnprintf.h" - #include "LeicaDMR.h" #include "LeicaDMRHub.h" #include diff --git a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp index 14b02356b..60258a2aa 100644 --- a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp +++ b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.cpp @@ -22,8 +22,6 @@ // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. // -#include "FixSnprintf.h" - #include "LeicaDMSTC.h" #include "LeicaDMSTCHub.h" #include diff --git a/DeviceAdapters/Ludl/Ludl.cpp b/DeviceAdapters/Ludl/Ludl.cpp index c93b3fd4b..959ef1d0e 100644 --- a/DeviceAdapters/Ludl/Ludl.cpp +++ b/DeviceAdapters/Ludl/Ludl.cpp @@ -30,7 +30,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Ludl.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/LudlLow/Ludl.cpp b/DeviceAdapters/LudlLow/Ludl.cpp index e3108f442..7d29130a4 100644 --- a/DeviceAdapters/LudlLow/Ludl.cpp +++ b/DeviceAdapters/LudlLow/Ludl.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Ludl.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/LumencorCIA/CIA.cpp b/DeviceAdapters/LumencorCIA/CIA.cpp index 826fff82f..e43b28b37 100644 --- a/DeviceAdapters/LumencorCIA/CIA.cpp +++ b/DeviceAdapters/LumencorCIA/CIA.cpp @@ -24,7 +24,6 @@ #include #include #endif -#include "FixSnprintf.h" #define DEBUG diff --git a/DeviceAdapters/LumencorCIA/LECtrl.cpp b/DeviceAdapters/LumencorCIA/LECtrl.cpp index 687061d88..37a576e37 100644 --- a/DeviceAdapters/LumencorCIA/LECtrl.cpp +++ b/DeviceAdapters/LumencorCIA/LECtrl.cpp @@ -24,7 +24,6 @@ #include #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MP285/MP285.cpp b/DeviceAdapters/MP285/MP285.cpp index f0cacc4eb..b618bef0a 100644 --- a/DeviceAdapters/MP285/MP285.cpp +++ b/DeviceAdapters/MP285/MP285.cpp @@ -33,7 +33,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MP285/MP285Ctrl.cpp b/DeviceAdapters/MP285/MP285Ctrl.cpp index 036f153c8..80ceca457 100644 --- a/DeviceAdapters/MP285/MP285Ctrl.cpp +++ b/DeviceAdapters/MP285/MP285Ctrl.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MP285/MP285Error.cpp b/DeviceAdapters/MP285/MP285Error.cpp index d853e8a72..7d66edb20 100644 --- a/DeviceAdapters/MP285/MP285Error.cpp +++ b/DeviceAdapters/MP285/MP285Error.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MP285/MP285XYStage.cpp b/DeviceAdapters/MP285/MP285XYStage.cpp index be6ef72c9..faf5901f2 100644 --- a/DeviceAdapters/MP285/MP285XYStage.cpp +++ b/DeviceAdapters/MP285/MP285XYStage.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MP285/MP285ZStage.cpp b/DeviceAdapters/MP285/MP285ZStage.cpp index cfb1d3c32..48becdf5b 100644 --- a/DeviceAdapters/MP285/MP285ZStage.cpp +++ b/DeviceAdapters/MP285/MP285ZStage.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/MT20/MT20.cpp b/DeviceAdapters/MT20/MT20.cpp index e119f0f6a..5dafa964f 100755 --- a/DeviceAdapters/MT20/MT20.cpp +++ b/DeviceAdapters/MT20/MT20.cpp @@ -35,8 +35,6 @@ const char* g_MT20Shutter = "MT20-Shutter"; const char* g_MT20Filterwheel = "MT20-Filterwheel"; const char* g_MT20Attenuator = "MT20-Attenuator"; -#include "FixSnprintf.h" - // instantiate MT20hub object, which will handle communication with device MT20hub mt20; diff --git a/DeviceAdapters/MT20/MT20hub.cpp b/DeviceAdapters/MT20/MT20hub.cpp index 6cb6cd5b8..c9f871edf 100644 --- a/DeviceAdapters/MT20/MT20hub.cpp +++ b/DeviceAdapters/MT20/MT20hub.cpp @@ -33,7 +33,6 @@ #else #include #endif -#include "FixSnprintf.h" MT20hub::MT20hub() : connected_(false), diff --git a/DeviceAdapters/MaestroServo/MaestroServo.cpp b/DeviceAdapters/MaestroServo/MaestroServo.cpp index d72cec3ea..a75cf01a4 100644 --- a/DeviceAdapters/MaestroServo/MaestroServo.cpp +++ b/DeviceAdapters/MaestroServo/MaestroServo.cpp @@ -20,7 +20,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "MaestroServo.h" #include diff --git a/DeviceAdapters/Marzhauser-LStep/LStep.cpp b/DeviceAdapters/Marzhauser-LStep/LStep.cpp index 462db45be..c7fd4ed0a 100644 --- a/DeviceAdapters/Marzhauser-LStep/LStep.cpp +++ b/DeviceAdapters/Marzhauser-LStep/LStep.cpp @@ -33,7 +33,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "LStep.h" #include diff --git a/DeviceAdapters/Marzhauser/Marzhauser.cpp b/DeviceAdapters/Marzhauser/Marzhauser.cpp index 16407f2f3..c6d4eb8ea 100644 --- a/DeviceAdapters/Marzhauser/Marzhauser.cpp +++ b/DeviceAdapters/Marzhauser/Marzhauser.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "Marzhauser.h" #include diff --git a/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp b/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp index 339d7501d..e38eb88fc 100644 --- a/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp +++ b/DeviceAdapters/MarzhauserLStepOld/LStepOld.cpp @@ -20,7 +20,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "LStepOld.h" #include diff --git a/DeviceAdapters/MicroFPGA/MicroFPGA.cpp b/DeviceAdapters/MicroFPGA/MicroFPGA.cpp index 5847d568b..4e297e863 100644 --- a/DeviceAdapters/MicroFPGA/MicroFPGA.cpp +++ b/DeviceAdapters/MicroFPGA/MicroFPGA.cpp @@ -20,7 +20,6 @@ #ifdef WIN32 #include -#define snprintf _snprintf #endif const char* g_DeviceNameMicroFPGAHub = "MicroFPGA-Hub"; diff --git a/DeviceAdapters/MicroPoint/MicroPoint.cpp b/DeviceAdapters/MicroPoint/MicroPoint.cpp index 9c6f182e4..2981d43f0 100644 --- a/DeviceAdapters/MicroPoint/MicroPoint.cpp +++ b/DeviceAdapters/MicroPoint/MicroPoint.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "MicroPoint.h" #include diff --git a/DeviceAdapters/NKTSuperK/SuperKModule.cpp b/DeviceAdapters/NKTSuperK/SuperKModule.cpp index 435d2bb9f..2cea36e9c 100644 --- a/DeviceAdapters/NKTSuperK/SuperKModule.cpp +++ b/DeviceAdapters/NKTSuperK/SuperKModule.cpp @@ -32,7 +32,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SuperK.h" diff --git a/DeviceAdapters/NeoPixel/NeoPixel.cpp b/DeviceAdapters/NeoPixel/NeoPixel.cpp index 725851f58..098ab4991 100644 --- a/DeviceAdapters/NeoPixel/NeoPixel.cpp +++ b/DeviceAdapters/NeoPixel/NeoPixel.cpp @@ -20,7 +20,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" const char* g_DeviceNameShutter = "NeoPixel-Shutter"; diff --git a/DeviceAdapters/Neos/Neos.cpp b/DeviceAdapters/Neos/Neos.cpp index 2992376f7..a30cab7a2 100644 --- a/DeviceAdapters/Neos/Neos.cpp +++ b/DeviceAdapters/Neos/Neos.cpp @@ -20,7 +20,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Neos.h" #include diff --git a/DeviceAdapters/NewportSMC/Newport.cpp b/DeviceAdapters/NewportSMC/Newport.cpp index 768076375..2356664ad 100644 --- a/DeviceAdapters/NewportSMC/Newport.cpp +++ b/DeviceAdapters/NewportSMC/Newport.cpp @@ -26,7 +26,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Newport.h" #include diff --git a/DeviceAdapters/Nikon/Nikon.cpp b/DeviceAdapters/Nikon/Nikon.cpp index 3ba84a493..e405bda8a 100644 --- a/DeviceAdapters/Nikon/Nikon.cpp +++ b/DeviceAdapters/Nikon/Nikon.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Nikon.h" #include diff --git a/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp b/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp index 1d245a951..9f01fa25b 100644 --- a/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp +++ b/DeviceAdapters/OVP_ECS2/OVP_ECS2.cpp @@ -20,9 +20,6 @@ // AUTHOR: Jon Daniels (jon@asiimaging.com) 06/2014 // - -#include "FixSnprintf.h" - #include "OVP_ECS2.h" #include "MMDevice.h" #include "DeviceBase.h" diff --git a/DeviceAdapters/ObjectiveImaging/OasisControl.cpp b/DeviceAdapters/ObjectiveImaging/OasisControl.cpp index 5c39b1463..e68f60729 100644 --- a/DeviceAdapters/ObjectiveImaging/OasisControl.cpp +++ b/DeviceAdapters/ObjectiveImaging/OasisControl.cpp @@ -32,7 +32,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" // The main Oasis controller API #include "oasis4i.h" diff --git a/DeviceAdapters/Omicron/CoherentOBISDirect.cpp b/DeviceAdapters/Omicron/CoherentOBISDirect.cpp index 01854a379..8e484376b 100644 --- a/DeviceAdapters/Omicron/CoherentOBISDirect.cpp +++ b/DeviceAdapters/Omicron/CoherentOBISDirect.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CoherentOBISDirect.h" diff --git a/DeviceAdapters/PI/PI.cpp b/DeviceAdapters/PI/PI.cpp index 05dd70842..e56d5a5ec 100644 --- a/DeviceAdapters/PI/PI.cpp +++ b/DeviceAdapters/PI/PI.cpp @@ -26,7 +26,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "PI.h" #include diff --git a/DeviceAdapters/PICAM/PICAMUniversal.cpp b/DeviceAdapters/PICAM/PICAMUniversal.cpp index e80af29b5..eacade6f8 100644 --- a/DeviceAdapters/PICAM/PICAMUniversal.cpp +++ b/DeviceAdapters/PICAM/PICAMUniversal.cpp @@ -70,8 +70,6 @@ using namespace std; #define START_ONPROPERTY(name,action) #endif -#include "FixSnprintf.h" - // Number of references to this class int Universal::refCount_ = 0; bool Universal::PICAM_initialized_ = false; diff --git a/DeviceAdapters/PI_GCS/PI_GCS.cpp b/DeviceAdapters/PI_GCS/PI_GCS.cpp index efd95969e..08834c813 100644 --- a/DeviceAdapters/PI_GCS/PI_GCS.cpp +++ b/DeviceAdapters/PI_GCS/PI_GCS.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "PI_GCS.h" #include diff --git a/DeviceAdapters/ParallelPort/ParallelPort.cpp b/DeviceAdapters/ParallelPort/ParallelPort.cpp index afa6bd5e5..405e56162 100644 --- a/DeviceAdapters/ParallelPort/ParallelPort.cpp +++ b/DeviceAdapters/ParallelPort/ParallelPort.cpp @@ -32,7 +32,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "ParallelPort.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Pecon/Pecon.cpp b/DeviceAdapters/Pecon/Pecon.cpp index f6c5ec215..30d59a91f 100644 --- a/DeviceAdapters/Pecon/Pecon.cpp +++ b/DeviceAdapters/Pecon/Pecon.cpp @@ -11,7 +11,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Pecon.h" #include diff --git a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp index 1a75607e7..e6a3694ed 100644 --- a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp +++ b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.cpp @@ -35,7 +35,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Piezosystem_30DV50.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp index 4c588e3db..29385981a 100644 --- a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp +++ b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Piezosystem_NV120_1.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp index 4c0cb3383..97b8430be 100644 --- a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp +++ b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.cpp @@ -35,7 +35,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Piezosystem_NV40_1.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp index 671731a8e..7bb94ad3a 100644 --- a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp +++ b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.cpp @@ -35,7 +35,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Piezosystem_NV40_3.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp index 36bd94ec0..a1a614f91 100755 --- a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp +++ b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.cpp @@ -37,7 +37,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Piezosystem_dDrive.h" #include "devicelist.h" diff --git a/DeviceAdapters/Piper/stdafx.h b/DeviceAdapters/Piper/stdafx.h index 7d318b4d9..4a2a84d2a 100755 --- a/DeviceAdapters/Piper/stdafx.h +++ b/DeviceAdapters/Piper/stdafx.h @@ -28,8 +28,6 @@ #include -#include "FixSnprintf.h" - #define __PIPER_API_EXPORT __declspec(dllimport) #include "PiperApiErrors.h" diff --git a/DeviceAdapters/PrecisExcite/PrecisExcite.cpp b/DeviceAdapters/PrecisExcite/PrecisExcite.cpp index 150f4cebd..b81d11fcb 100644 --- a/DeviceAdapters/PrecisExcite/PrecisExcite.cpp +++ b/DeviceAdapters/PrecisExcite/PrecisExcite.cpp @@ -22,13 +22,9 @@ // CVS: // - - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "PrecisExcite.h" diff --git a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp index c4fdd0c24..043e4fc2c 100644 --- a/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp +++ b/DeviceAdapters/PrincetonInstruments/PVCAMUniversal.cpp @@ -58,8 +58,6 @@ #include #include -#include "FixSnprintf.h" - using namespace std; unsigned Universal::refCount_ = 0; bool Universal::PVCAM_initialized_ = false; diff --git a/DeviceAdapters/Prior/Prior.cpp b/DeviceAdapters/Prior/Prior.cpp index d39998c19..7d2dd4042 100644 --- a/DeviceAdapters/Prior/Prior.cpp +++ b/DeviceAdapters/Prior/Prior.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "prior.h" #include diff --git a/DeviceAdapters/PriorLegacy/PriorLegacy.cpp b/DeviceAdapters/PriorLegacy/PriorLegacy.cpp index 34a623350..f36c725d0 100644 --- a/DeviceAdapters/PriorLegacy/PriorLegacy.cpp +++ b/DeviceAdapters/PriorLegacy/PriorLegacy.cpp @@ -30,7 +30,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "PriorLegacy.h" #include diff --git a/DeviceAdapters/PrizmatixDevice/PrizmatixMain.cpp b/DeviceAdapters/PrizmatixDevice/PrizmatixMain.cpp index d589e3dde..7edf3bcfe 100644 --- a/DeviceAdapters/PrizmatixDevice/PrizmatixMain.cpp +++ b/DeviceAdapters/PrizmatixDevice/PrizmatixMain.cpp @@ -3,8 +3,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" - const char* g_DeviceNameHub = "prizmatix-Hub"; const char* g_DeviceOneLED = "Prizmatix Ctrl"; diff --git a/DeviceAdapters/Rapp/Rapp.cpp b/DeviceAdapters/Rapp/Rapp.cpp index ffe14d228..053237f09 100644 --- a/DeviceAdapters/Rapp/Rapp.cpp +++ b/DeviceAdapters/Rapp/Rapp.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "Rapp.h" #include diff --git a/DeviceAdapters/Sapphire/Sapphire.cpp b/DeviceAdapters/Sapphire/Sapphire.cpp index f4c6acff7..91e27e903 100644 --- a/DeviceAdapters/Sapphire/Sapphire.cpp +++ b/DeviceAdapters/Sapphire/Sapphire.cpp @@ -22,13 +22,9 @@ // CVS: // - - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "Sapphire.h" diff --git a/DeviceAdapters/Scientifica/Scientifica.cpp b/DeviceAdapters/Scientifica/Scientifica.cpp index 0d86ca44d..504056e97 100644 --- a/DeviceAdapters/Scientifica/Scientifica.cpp +++ b/DeviceAdapters/Scientifica/Scientifica.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Scientifica.h" #include diff --git a/DeviceAdapters/ScionCam/ScionCamera.cpp b/DeviceAdapters/ScionCam/ScionCamera.cpp index 5a70f2e2a..3befd8828 100644 --- a/DeviceAdapters/ScionCam/ScionCamera.cpp +++ b/DeviceAdapters/ScionCam/ScionCamera.cpp @@ -37,12 +37,10 @@ // CVS: $Id: ScionCamera.c,v 1.33 2009/08/19 22:40:57 nenad Exp $ // - #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "ScionCamera.h" #include diff --git a/DeviceAdapters/ScionCam/capture.cpp b/DeviceAdapters/ScionCam/capture.cpp index a48f088bf..24288a10e 100644 --- a/DeviceAdapters/ScionCam/capture.cpp +++ b/DeviceAdapters/ScionCam/capture.cpp @@ -41,7 +41,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "ScionCamera.h" #include diff --git a/DeviceAdapters/ScionCam/utilities.cpp b/DeviceAdapters/ScionCam/utilities.cpp index fdd4d7735..49c1c37ba 100644 --- a/DeviceAdapters/ScionCam/utilities.cpp +++ b/DeviceAdapters/ScionCam/utilities.cpp @@ -41,7 +41,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "ScionCamera.h" diff --git a/DeviceAdapters/Sensicam/Sensicam.cpp b/DeviceAdapters/Sensicam/Sensicam.cpp index 23d5c2840..9cb3a61f0 100644 --- a/DeviceAdapters/Sensicam/Sensicam.cpp +++ b/DeviceAdapters/Sensicam/Sensicam.cpp @@ -40,13 +40,9 @@ #include #include // Liisa: for ceil - - // temp #include "stdio.h" -#include "FixSnprintf.h" - using namespace std; CSensicam* CSensicam::m_pInstance = 0; diff --git a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp index eb3c42bbf..1591601ec 100644 --- a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp +++ b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.cpp @@ -14,7 +14,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SmarActHCU-3D.h" #include diff --git a/DeviceAdapters/Spot/SpotCamera.cpp b/DeviceAdapters/Spot/SpotCamera.cpp index 4fa97f73d..31189a8f7 100644 --- a/DeviceAdapters/Spot/SpotCamera.cpp +++ b/DeviceAdapters/Spot/SpotCamera.cpp @@ -26,7 +26,6 @@ #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/Standa/Standa.cpp b/DeviceAdapters/Standa/Standa.cpp index 7e8945dcd..dd03ce114 100644 --- a/DeviceAdapters/Standa/Standa.cpp +++ b/DeviceAdapters/Standa/Standa.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Standa.h" diff --git a/DeviceAdapters/SutterLambda/SutterLambda.cpp b/DeviceAdapters/SutterLambda/SutterLambda.cpp index 10d642495..e9bf2f1ca 100644 --- a/DeviceAdapters/SutterLambda/SutterLambda.cpp +++ b/DeviceAdapters/SutterLambda/SutterLambda.cpp @@ -22,7 +22,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SutterLambda.h" #include diff --git a/DeviceAdapters/SutterLambda2/SutterLambda2.cpp b/DeviceAdapters/SutterLambda2/SutterLambda2.cpp index 0bd122f13..db91adb1f 100644 --- a/DeviceAdapters/SutterLambda2/SutterLambda2.cpp +++ b/DeviceAdapters/SutterLambda2/SutterLambda2.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SutterHub.h" #include "SutterWheel.h" diff --git a/DeviceAdapters/SutterStage/SutterStage.cpp b/DeviceAdapters/SutterStage/SutterStage.cpp index fa92008f1..8a1c6fdfd 100644 --- a/DeviceAdapters/SutterStage/SutterStage.cpp +++ b/DeviceAdapters/SutterStage/SutterStage.cpp @@ -30,7 +30,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SutterStage.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/TeesnySLM/TeensySLM.cpp b/DeviceAdapters/TeesnySLM/TeensySLM.cpp index 570843ea8..b7a7cbcf2 100644 --- a/DeviceAdapters/TeesnySLM/TeensySLM.cpp +++ b/DeviceAdapters/TeesnySLM/TeensySLM.cpp @@ -20,7 +20,6 @@ #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include - #define snprintf _snprintf #endif diff --git a/DeviceAdapters/Thorlabs/IntegratedFilterWheel.cpp b/DeviceAdapters/Thorlabs/IntegratedFilterWheel.cpp index e27793cc5..b8f604420 100644 --- a/DeviceAdapters/Thorlabs/IntegratedFilterWheel.cpp +++ b/DeviceAdapters/Thorlabs/IntegratedFilterWheel.cpp @@ -20,12 +20,10 @@ // AUTHOR: Nenad Amodaj, http://nenad.amodaj.com, 2011 // - #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" // Prevent "unused variable" warnings. #ifdef __GNUC__ diff --git a/DeviceAdapters/Thorlabs/MotorZStage.cpp b/DeviceAdapters/Thorlabs/MotorZStage.cpp index ca507820c..ae75d702d 100644 --- a/DeviceAdapters/Thorlabs/MotorZStage.cpp +++ b/DeviceAdapters/Thorlabs/MotorZStage.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "MotorZStage.h" #include "Thorlabs.h" diff --git a/DeviceAdapters/Thorlabs/PiezoZStage.cpp b/DeviceAdapters/Thorlabs/PiezoZStage.cpp index 7b03103bb..ce476a33f 100644 --- a/DeviceAdapters/Thorlabs/PiezoZStage.cpp +++ b/DeviceAdapters/Thorlabs/PiezoZStage.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "PiezoZStage.h" #include "Thorlabs.h" diff --git a/DeviceAdapters/Thorlabs/Thorlabs.cpp b/DeviceAdapters/Thorlabs/Thorlabs.cpp index 2a25afa96..e6954e462 100644 --- a/DeviceAdapters/Thorlabs/Thorlabs.cpp +++ b/DeviceAdapters/Thorlabs/Thorlabs.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Thorlabs.h" #include "XYStage.h" diff --git a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.cpp b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.cpp index bd0e7524d..9c0bea387 100644 --- a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.cpp +++ b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.cpp @@ -42,7 +42,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ThorlabsAPTStage.h" #include "APTAPI.h" diff --git a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp index e677fe2a9..7e7cbc66c 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp +++ b/DeviceAdapters/ThorlabsDCxxxx/DCxxxx_Plugin.cpp @@ -21,11 +21,9 @@ // AUTHOR: Olaf Wohlmann, owohlmann@thorlabs.com // - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include #include "DCxxxx_Plugin.h" diff --git a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp index bb169962a..8653ffa78 100644 --- a/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp +++ b/DeviceAdapters/ThorlabsFilterWheel/FilterWheel.cpp @@ -23,12 +23,10 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include #endif -#include "FixSnprintf.h" #include "FilterWheel.h" #include diff --git a/DeviceAdapters/ThorlabsSC10/SC10.cpp b/DeviceAdapters/ThorlabsSC10/SC10.cpp index d1d7d44e7..88fb660eb 100644 --- a/DeviceAdapters/ThorlabsSC10/SC10.cpp +++ b/DeviceAdapters/ThorlabsSC10/SC10.cpp @@ -13,7 +13,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "SC10.h" #include diff --git a/DeviceAdapters/Thorlabs_ELL14/ELL14.cpp b/DeviceAdapters/Thorlabs_ELL14/ELL14.cpp index b100264c6..d105b98f4 100644 --- a/DeviceAdapters/Thorlabs_ELL14/ELL14.cpp +++ b/DeviceAdapters/Thorlabs_ELL14/ELL14.cpp @@ -13,7 +13,6 @@ #ifdef WIN32 #include -#define snprintf _snprintf #endif #include "ELL14.h" diff --git a/DeviceAdapters/Tofra/Tofra.cpp b/DeviceAdapters/Tofra/Tofra.cpp index 4a695d6ae..dadb39699 100644 --- a/DeviceAdapters/Tofra/Tofra.cpp +++ b/DeviceAdapters/Tofra/Tofra.cpp @@ -25,7 +25,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Tofra.h" #include diff --git a/DeviceAdapters/Vincent/Vincent.cpp b/DeviceAdapters/Vincent/Vincent.cpp index a50097208..e98732f84 100644 --- a/DeviceAdapters/Vincent/Vincent.cpp +++ b/DeviceAdapters/Vincent/Vincent.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Vincent.h" #include diff --git a/DeviceAdapters/Vortran/Stradus.cpp b/DeviceAdapters/Vortran/Stradus.cpp index d468562ea..ede5292e5 100644 --- a/DeviceAdapters/Vortran/Stradus.cpp +++ b/DeviceAdapters/Vortran/Stradus.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "MMDevice.h" #include diff --git a/DeviceAdapters/Vortran/VersaLase.cpp b/DeviceAdapters/Vortran/VersaLase.cpp index c0ad29dd4..397af8c5a 100644 --- a/DeviceAdapters/Vortran/VersaLase.cpp +++ b/DeviceAdapters/Vortran/VersaLase.cpp @@ -51,7 +51,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "MMDevice.h" #include "DeviceBase.h" diff --git a/DeviceAdapters/WOSM/WOSM_rev.cpp b/DeviceAdapters/WOSM/WOSM_rev.cpp index 8c20f129f..c3749d10a 100644 --- a/DeviceAdapters/WOSM/WOSM_rev.cpp +++ b/DeviceAdapters/WOSM/WOSM_rev.cpp @@ -110,7 +110,6 @@ #include #include #include -#include "FixSnprintf.h" using namespace std; //$$ diff --git a/DeviceAdapters/WieneckeSinske/CAN29.cpp b/DeviceAdapters/WieneckeSinske/CAN29.cpp index fd0e9e051..a3e4ffa21 100644 --- a/DeviceAdapters/WieneckeSinske/CAN29.cpp +++ b/DeviceAdapters/WieneckeSinske/CAN29.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "CAN29.h" #include diff --git a/DeviceAdapters/WieneckeSinske/CAN29Axis.cpp b/DeviceAdapters/WieneckeSinske/CAN29Axis.cpp index 8710d7a84..2b5aafc23 100644 --- a/DeviceAdapters/WieneckeSinske/CAN29Axis.cpp +++ b/DeviceAdapters/WieneckeSinske/CAN29Axis.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/WieneckeSinske/WS.cpp b/DeviceAdapters/WieneckeSinske/WS.cpp index 4ad50afdf..05b7a1f43 100644 --- a/DeviceAdapters/WieneckeSinske/WS.cpp +++ b/DeviceAdapters/WieneckeSinske/WS.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "WS.h" #include diff --git a/DeviceAdapters/WieneckeSinske/WSAxis.cpp b/DeviceAdapters/WieneckeSinske/WSAxis.cpp index a71a6124f..29dc35741 100644 --- a/DeviceAdapters/WieneckeSinske/WSAxis.cpp +++ b/DeviceAdapters/WieneckeSinske/WSAxis.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp b/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp index 8f53344ef..a57647b32 100644 --- a/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp +++ b/DeviceAdapters/WieneckeSinske/WieneckeSinske.cpp @@ -32,7 +32,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "WieneckeSinske.h" #include diff --git a/DeviceAdapters/WieneckeSinske/XYStageDevice.cpp b/DeviceAdapters/WieneckeSinske/XYStageDevice.cpp index e27576985..5163daead 100644 --- a/DeviceAdapters/WieneckeSinske/XYStageDevice.cpp +++ b/DeviceAdapters/WieneckeSinske/XYStageDevice.cpp @@ -32,7 +32,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "XYStageDevice.h" #include diff --git a/DeviceAdapters/WieneckeSinske/ZPiezoCanDevice.cpp b/DeviceAdapters/WieneckeSinske/ZPiezoCanDevice.cpp index d87b7790c..149edbb2e 100644 --- a/DeviceAdapters/WieneckeSinske/ZPiezoCanDevice.cpp +++ b/DeviceAdapters/WieneckeSinske/ZPiezoCanDevice.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "WieneckeSinske.h" #include diff --git a/DeviceAdapters/WieneckeSinske/ZPiezoWSDevice.cpp b/DeviceAdapters/WieneckeSinske/ZPiezoWSDevice.cpp index 6c13f8d3e..7f969f875 100644 --- a/DeviceAdapters/WieneckeSinske/ZPiezoWSDevice.cpp +++ b/DeviceAdapters/WieneckeSinske/ZPiezoWSDevice.cpp @@ -31,7 +31,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "WieneckeSinske.h" #include diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite.cpp b/DeviceAdapters/XCite120PC_Exacte/XCite.cpp index a276591ac..dc326ce8a 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCite.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "XCite120PC.h" #include "XCiteExacte.h" diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp index 5bd4f6621..ae703b643 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCite120PC.cpp @@ -28,7 +28,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "XCite120PC.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp index 15f82e0aa..3abacd6a9 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp +++ b/DeviceAdapters/XCite120PC_Exacte/XCiteExacte.cpp @@ -29,7 +29,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "XCiteExacte.h" #include "ModuleInterface.h" diff --git a/DeviceAdapters/XCiteLed/XLed.cpp b/DeviceAdapters/XCiteLed/XLed.cpp index 5a18565aa..2b09bfbd0 100644 --- a/DeviceAdapters/XCiteLed/XLed.cpp +++ b/DeviceAdapters/XCiteLed/XLed.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XCiteLed/XLedCtrl.cpp b/DeviceAdapters/XCiteLed/XLedCtrl.cpp index fb24d4607..02ec361b5 100644 --- a/DeviceAdapters/XCiteLed/XLedCtrl.cpp +++ b/DeviceAdapters/XCiteLed/XLedCtrl.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XCiteLed/XLedDev.cpp b/DeviceAdapters/XCiteLed/XLedDev.cpp index b7426e910..164ced580 100644 --- a/DeviceAdapters/XCiteLed/XLedDev.cpp +++ b/DeviceAdapters/XCiteLed/XLedDev.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XCiteXT600/XT600.cpp b/DeviceAdapters/XCiteXT600/XT600.cpp index c136c1b34..9823e6b43 100644 --- a/DeviceAdapters/XCiteXT600/XT600.cpp +++ b/DeviceAdapters/XCiteXT600/XT600.cpp @@ -33,7 +33,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp b/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp index e0dc59a4f..217e32751 100644 --- a/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp +++ b/DeviceAdapters/XCiteXT600/XT600Ctrl.cpp @@ -32,7 +32,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XCiteXT600/XT600Dev.cpp b/DeviceAdapters/XCiteXT600/XT600Dev.cpp index c91607629..4053cc2b2 100644 --- a/DeviceAdapters/XCiteXT600/XT600Dev.cpp +++ b/DeviceAdapters/XCiteXT600/XT600Dev.cpp @@ -33,7 +33,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/XLight/XLight.cpp b/DeviceAdapters/XLight/XLight.cpp index 787dfc3b9..b5c24b1ef 100644 --- a/DeviceAdapters/XLight/XLight.cpp +++ b/DeviceAdapters/XLight/XLight.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "XLight.h" #include "XLIGHTHub.h" diff --git a/DeviceAdapters/Xcite/Xcite.cpp b/DeviceAdapters/Xcite/Xcite.cpp index 7b2540674..eef154ea6 100755 --- a/DeviceAdapters/Xcite/Xcite.cpp +++ b/DeviceAdapters/Xcite/Xcite.cpp @@ -20,11 +20,9 @@ // This code is based on the Vincent Uniblitz controller adapter // by Nico Stuurman, 2006 - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "Xcite.h" #include diff --git a/DeviceAdapters/Yokogawa/CSU22.cpp b/DeviceAdapters/Yokogawa/CSU22.cpp index 0ea842749..4c36631c5 100644 --- a/DeviceAdapters/Yokogawa/CSU22.cpp +++ b/DeviceAdapters/Yokogawa/CSU22.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CSU22.h" #include "CSU22Hub.h" diff --git a/DeviceAdapters/Yokogawa/CSUX.cpp b/DeviceAdapters/Yokogawa/CSUX.cpp index 6795fcc17..194823687 100644 --- a/DeviceAdapters/Yokogawa/CSUX.cpp +++ b/DeviceAdapters/Yokogawa/CSUX.cpp @@ -34,7 +34,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "CSUX.h" #include "CSUXHub.h" diff --git a/DeviceAdapters/Zaber/FilterCubeTurret.cpp b/DeviceAdapters/Zaber/FilterCubeTurret.cpp index 5e08e77cd..3044c6fc8 100644 --- a/DeviceAdapters/Zaber/FilterCubeTurret.cpp +++ b/DeviceAdapters/Zaber/FilterCubeTurret.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "FilterCubeTurret.h" diff --git a/DeviceAdapters/Zaber/FilterWheel.cpp b/DeviceAdapters/Zaber/FilterWheel.cpp index 008dcb78f..2466cdf0a 100644 --- a/DeviceAdapters/Zaber/FilterWheel.cpp +++ b/DeviceAdapters/Zaber/FilterWheel.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "FilterWheel.h" diff --git a/DeviceAdapters/Zaber/Illuminator.cpp b/DeviceAdapters/Zaber/Illuminator.cpp index 9d5b2ab24..cbf4fbce2 100644 --- a/DeviceAdapters/Zaber/Illuminator.cpp +++ b/DeviceAdapters/Zaber/Illuminator.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "Illuminator.h" diff --git a/DeviceAdapters/Zaber/ObjectiveChanger.cpp b/DeviceAdapters/Zaber/ObjectiveChanger.cpp index fbeebd556..e44c9bd97 100644 --- a/DeviceAdapters/Zaber/ObjectiveChanger.cpp +++ b/DeviceAdapters/Zaber/ObjectiveChanger.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "ObjectiveChanger.h" diff --git a/DeviceAdapters/Zaber/Stage.cpp b/DeviceAdapters/Zaber/Stage.cpp index 2f60785ec..8dfe20b97 100644 --- a/DeviceAdapters/Zaber/Stage.cpp +++ b/DeviceAdapters/Zaber/Stage.cpp @@ -23,7 +23,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "Stage.h" diff --git a/DeviceAdapters/Zaber/XYStage.cpp b/DeviceAdapters/Zaber/XYStage.cpp index e294da976..b16a2ffe9 100644 --- a/DeviceAdapters/Zaber/XYStage.cpp +++ b/DeviceAdapters/Zaber/XYStage.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "XYStage.h" diff --git a/DeviceAdapters/Zaber/Zaber.cpp b/DeviceAdapters/Zaber/Zaber.cpp index a97ba4c49..b242ffb1e 100644 --- a/DeviceAdapters/Zaber/Zaber.cpp +++ b/DeviceAdapters/Zaber/Zaber.cpp @@ -24,7 +24,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "Zaber.h" #include "XYStage.h" diff --git a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h index 1385657b3..1323e3db8 100644 --- a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h +++ b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.h @@ -44,7 +44,6 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifndef _ZEISSCAN29_H_ #define _ZEISSCAN29_H_ @@ -54,7 +53,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "MMDevice.h" #include "DeviceBase.h" diff --git a/DeviceAdapters/ZeissCAN/PhotoModule.cpp b/DeviceAdapters/ZeissCAN/PhotoModule.cpp index bd3124fe4..d46b3d893 100644 --- a/DeviceAdapters/ZeissCAN/PhotoModule.cpp +++ b/DeviceAdapters/ZeissCAN/PhotoModule.cpp @@ -2,7 +2,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ZeissCAN.h" using namespace std; diff --git a/DeviceAdapters/ZeissCAN/ZStage.cpp b/DeviceAdapters/ZeissCAN/ZStage.cpp index eaa2bf500..07a945728 100644 --- a/DeviceAdapters/ZeissCAN/ZStage.cpp +++ b/DeviceAdapters/ZeissCAN/ZStage.cpp @@ -7,11 +7,9 @@ // Zeiss CAN bus controller for Axioscop 2 MOT, Z-stage // - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ZeissCAN.h" using namespace std; diff --git a/DeviceAdapters/ZeissCAN/ZeissCAN.cpp b/DeviceAdapters/ZeissCAN/ZeissCAN.cpp index 9c78d1ebf..d37419365 100644 --- a/DeviceAdapters/ZeissCAN/ZeissCAN.cpp +++ b/DeviceAdapters/ZeissCAN/ZeissCAN.cpp @@ -27,11 +27,9 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ZeissCAN.h" #include diff --git a/DeviceAdapters/ZeissCAN/mcu28.cpp b/DeviceAdapters/ZeissCAN/mcu28.cpp index ea220134b..68e87fe6f 100644 --- a/DeviceAdapters/ZeissCAN/mcu28.cpp +++ b/DeviceAdapters/ZeissCAN/mcu28.cpp @@ -28,11 +28,9 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "ZeissCAN.h" #include diff --git a/DeviceAdapters/ZeissCAN29/ZeissCAN29.h b/DeviceAdapters/ZeissCAN29/ZeissCAN29.h index 2e9d328a4..f7fee7a13 100644 --- a/DeviceAdapters/ZeissCAN29/ZeissCAN29.h +++ b/DeviceAdapters/ZeissCAN29/ZeissCAN29.h @@ -38,7 +38,6 @@ // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. - #ifndef _ZEISSCAN29_H_ #define _ZEISSCAN29_H_ @@ -48,7 +47,6 @@ #else #include #endif -#include "FixSnprintf.h" #include "MMDevice.h" #include "DeviceBase.h" diff --git a/DeviceAdapters/kdv/KDV.cpp b/DeviceAdapters/kdv/KDV.cpp index 038078091..b656722e5 100644 --- a/DeviceAdapters/kdv/KDV.cpp +++ b/DeviceAdapters/kdv/KDV.cpp @@ -32,7 +32,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include "KDV.h" #include diff --git a/DeviceAdapters/nPoint/nPC400.cpp b/DeviceAdapters/nPoint/nPC400.cpp index 3438ad871..7dd294d4f 100755 --- a/DeviceAdapters/nPoint/nPC400.cpp +++ b/DeviceAdapters/nPoint/nPC400.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/nPoint/nPC400Channel.cpp b/DeviceAdapters/nPoint/nPC400Channel.cpp index ab509fd0e..c5c4af549 100755 --- a/DeviceAdapters/nPoint/nPC400Channel.cpp +++ b/DeviceAdapters/nPoint/nPC400Channel.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/nPoint/nPC400Ctrl.cpp b/DeviceAdapters/nPoint/nPC400Ctrl.cpp index 2cc9a26b6..f87316ffe 100755 --- a/DeviceAdapters/nPoint/nPC400Ctrl.cpp +++ b/DeviceAdapters/nPoint/nPC400Ctrl.cpp @@ -31,7 +31,6 @@ #ifdef WIN32 #include #endif -#include "FixSnprintf.h" #include #include diff --git a/DeviceAdapters/pgFocus/pgFocus.cpp b/DeviceAdapters/pgFocus/pgFocus.cpp index 4bf381e2c..f3bea3673 100644 --- a/DeviceAdapters/pgFocus/pgFocus.cpp +++ b/DeviceAdapters/pgFocus/pgFocus.cpp @@ -18,7 +18,6 @@ #ifdef WIN32 #pragma warning(disable: 4355) #endif -#include "FixSnprintf.h" #include "pgFocus.h" #include diff --git a/DeviceAdapters/pgFocus/pgFocus.h b/DeviceAdapters/pgFocus/pgFocus.h index 91d1a08d3..4623cd4eb 100644 --- a/DeviceAdapters/pgFocus/pgFocus.h +++ b/DeviceAdapters/pgFocus/pgFocus.h @@ -23,8 +23,6 @@ #else #include #endif -#include "FixSnprintf.h" - #include "MMDevice.h" #include "DeviceBase.h" diff --git a/MMCore/Host.cpp b/MMCore/Host.cpp index d87c0de7b..506fd6293 100644 --- a/MMCore/Host.cpp +++ b/MMCore/Host.cpp @@ -20,7 +20,6 @@ // // AUTHOR: Karl Hoover karl.hoover@gmail.com 2011 - #include "Host.h" #ifdef _WINDOWS @@ -29,8 +28,6 @@ #include #endif //_WINDOWS -#include "../MMDevice/FixSnprintf.h" - #ifdef __APPLE__ #include "AppleHost.h" diff --git a/MMCore/Makefile.am b/MMCore/Makefile.am index 8babcab15..f51e065ce 100644 --- a/MMCore/Makefile.am +++ b/MMCore/Makefile.am @@ -7,7 +7,6 @@ noinst_LTLIBRARIES = libMMCore.la libMMCore_la_LIBADD = ../MMDevice/libMMDevice.la libMMCore_la_SOURCES = \ - ../MMDevice/FixSnprintf.h \ ../MMDevice/MMDevice.h \ ../MMDevice/MMDeviceConstants.h \ ../MMDevice/ModuleInterface.h \ diff --git a/MMCoreJ_wrap/Makefile.am b/MMCoreJ_wrap/Makefile.am index f408cc480..7b2100005 100644 --- a/MMCoreJ_wrap/Makefile.am +++ b/MMCoreJ_wrap/Makefile.am @@ -31,7 +31,6 @@ swig_sources = MMCoreJ.i \ ../MMCore/MMCore.h \ ../MMCore/MMEventCallback.h \ ../MMCore/PluginManager.h \ - ../MMDevice/FixSnprintf.h \ ../MMDevice/ImageMetadata.h \ ../MMDevice/MMDevice.h \ ../MMDevice/MMDeviceConstants.h diff --git a/MMDevice/DeviceUtils.cpp b/MMDevice/DeviceUtils.cpp index 7f0df5262..fe5162a8d 100644 --- a/MMDevice/DeviceUtils.cpp +++ b/MMDevice/DeviceUtils.cpp @@ -31,8 +31,6 @@ #include #endif -#include "FixSnprintf.h" - char CDeviceUtils::m_pszBuffer[MM::MaxStrLength]={""}; /** diff --git a/MMDevice/FixSnprintf.h b/MMDevice/FixSnprintf.h deleted file mode 100644 index d30b5d692..000000000 --- a/MMDevice/FixSnprintf.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Provide snprintf() for MSVC prior to VS2015 - * This file is part of MMDevice - * - * Author: Mark Tsuchida - * - * (C)2020 Board of Regents of the University of Wisconsin System - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -// VC++ added a proper snprintf() in VS2015. Prior to that, both _snprintf() -// and _snprintf_s() were incompatible with the C standard snprintf(). -// This file serves as a single location where this issue is dealt with. -// -// This file can be included before or after stdio.h, but should be included -// outside of any conditional compilation block. - -#if defined(_MSC_VER) && _MSC_VER < 1900 // VS2015 - -// Unlike snprintf(), _snprintf() does not null-terminate the result if it is -// longer than the buffer. However, Micro-Manager code has customarily defined -// snprintf to be _snprintf. Since we will be moving to a newer compiler in the -// near future (at which point this file can be removed), I'm just keeping that -// method rather than trying to emulate correct behavior (it's trickier than it -// initially appears). - -#define snprintf _snprintf - -#endif diff --git a/MMDevice/MMDevice-SharedRuntime.vcxproj b/MMDevice/MMDevice-SharedRuntime.vcxproj index 68a792d41..d1e1f8636 100644 --- a/MMDevice/MMDevice-SharedRuntime.vcxproj +++ b/MMDevice/MMDevice-SharedRuntime.vcxproj @@ -23,7 +23,6 @@ - diff --git a/MMDevice/MMDevice-SharedRuntime.vcxproj.filters b/MMDevice/MMDevice-SharedRuntime.vcxproj.filters index 069df08d2..2f38adf00 100644 --- a/MMDevice/MMDevice-SharedRuntime.vcxproj.filters +++ b/MMDevice/MMDevice-SharedRuntime.vcxproj.filters @@ -43,9 +43,6 @@ Header Files - - Header Files - Header Files diff --git a/MMDevice/MMDevice-StaticRuntime.vcxproj b/MMDevice/MMDevice-StaticRuntime.vcxproj index 99d845cac..be67f1eed 100644 --- a/MMDevice/MMDevice-StaticRuntime.vcxproj +++ b/MMDevice/MMDevice-StaticRuntime.vcxproj @@ -23,7 +23,6 @@ - diff --git a/MMDevice/MMDevice-StaticRuntime.vcxproj.filters b/MMDevice/MMDevice-StaticRuntime.vcxproj.filters index 069df08d2..2f38adf00 100644 --- a/MMDevice/MMDevice-StaticRuntime.vcxproj.filters +++ b/MMDevice/MMDevice-StaticRuntime.vcxproj.filters @@ -43,9 +43,6 @@ Header Files - - Header Files - Header Files diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index cd070d6ff..6b53c047b 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -70,7 +70,6 @@ # define MM_DEPRECATED(prototype) prototype #endif - #ifdef WIN32 #define WIN32_LEAN_AND_MEAN #include @@ -80,13 +79,8 @@ typedef void* HDEVMODULE; #endif -#include "FixSnprintf.h" - - class ImgBuffer; - - namespace MM { // forward declaration for the MMCore callback class diff --git a/MMDevice/Makefile.am b/MMDevice/Makefile.am index 951766123..33444b2e0 100644 --- a/MMDevice/Makefile.am +++ b/MMDevice/Makefile.am @@ -5,7 +5,6 @@ noinst_HEADERS = \ DeviceBase.h \ DeviceThreads.h \ DeviceUtils.h \ - FixSnprintf.h \ ImageMetadata.h \ ImgBuffer.h \ MMDevice.h \ diff --git a/MMDevice/Property.cpp b/MMDevice/Property.cpp index 8d1b55d66..1e7a3b5a1 100644 --- a/MMDevice/Property.cpp +++ b/MMDevice/Property.cpp @@ -26,8 +26,6 @@ using namespace std; -#include "FixSnprintf.h" - const int BUFSIZE = 60; // For number-to-string conversion