Merge branch 'micro-manager:main' into main

samdrea · Nov 7, 2023 · d91b6a3 · d91b6a3
2 parents 81dfe6e + bd4704f
commit d91b6a3
Show file tree

Hide file tree

Showing 279 changed files with 19,914 additions and 4,837 deletions.
diff --git a/DeviceAdapters/AAAOTF/AAAOTF.cpp b/DeviceAdapters/AAAOTF/AAAOTF.cpp
@@ -11,7 +11,6 @@
 #ifdef WIN32
    #include <windows.h>
 #endif
-#include "FixSnprintf.h"
 
 #include "AAAOTF.h"
 #include <string>

diff --git a/DeviceAdapters/ABS/ABSCamera.h b/DeviceAdapters/ABS/ABSCamera.h
@@ -6,7 +6,6 @@
    #include <windows.h>   
    #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
@@ -26,7 +26,6 @@
    #include <windows.h>   
    #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
@@ -5,7 +5,6 @@
    #include <windows.h>   
    #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
@@ -3,7 +3,6 @@
   #include <windows.h>   
   #pragma warning(disable : 4996) // disable warning for deperecated CRT functions on Windows 
 #endif
-#include "FixSnprintf.h"
 #include <stdio.h>
 #include "delayimp.h"
 #include "ABSDelayLoadDll.h"

diff --git a/DeviceAdapters/AOTF/AOTF.cpp b/DeviceAdapters/AOTF/AOTF.cpp
@@ -29,7 +29,6 @@
    #define WIN32_LEAN_AND_MEAN
    #include <windows.h>
 #endif
-#include "FixSnprintf.h"
 
 #include "AOTF.h"
 #include "ModuleInterface.h"

diff --git 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 <string>
 #include <math.h>

diff --git a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.cpp
@@ -14,7 +14,6 @@
    #define WIN32_LEAN_AND_MEAN
    #include <windows.h>
 #endif
-#include "FixSnprintf.h"
 
 #include "AgilentLaserCombiner.h"
 #include "LaserCombinerSDK.h"

diff --git a/DeviceAdapters/Aladdin/Aladdin.cpp b/DeviceAdapters/Aladdin/Aladdin.cpp
@@ -27,7 +27,6 @@
 #ifdef WIN32
    #include <windows.h>
 #endif
-#include "FixSnprintf.h"
 
 
 #include "MMDevice.h"