Merge pull request #433 from micro-manager/remove-windows-gettimeofday

MMDevice: Remove gettimeofday() for Windows
micro-manager · Jan 22, 2024 · 6857bb2 · 6857bb2
2 parents 62855a4 + 5a0ba3b
commit 6857bb2
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 71 deletions.
diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp b/DeviceAdapters/IlluminateLEDArray/LEDArray.cpp
@@ -908,7 +908,7 @@ int LedArray::ReadResponse() {
 	return DEVICE_ERR;
 }
 
-int LedArray::SetShutter(boolean open)
+int LedArray::SetShutter(bool open)
 {
 	//TODO maybe update property?
 	shutterOpen_ = open;

diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.h b/DeviceAdapters/IlluminateLEDArray/LEDArray.h
@@ -271,7 +271,7 @@ class LedArray: public  CSLMBase<LedArray>
 	  int OnBrightness(MM::PropertyBase* pPropt, MM::ActionType eAct);
 
 
-	  int SetShutter(boolean open);
+	  int SetShutter(bool open);
 	  bool GetShutter();
 
 private:

diff --git a/DeviceAdapters/PointGrey/PointGrey.cpp b/DeviceAdapters/PointGrey/PointGrey.cpp
@@ -1928,7 +1928,7 @@ int PointGrey::CameraID(PGRGuid id, std::string* camIdString)
  */
 int PointGrey::CameraGUIDfromOurID(BusManager* busMgr, PGRGuid* guid, std::string ourId)
 {
-   boolean found = false;
+   bool found = false;
    unsigned int numCameras;
    PGRGuid localGuid;
    Error error = busMgr->GetNumOfCameras(&numCameras);
@@ -1984,7 +1984,7 @@ int PointGrey::VideoModeAndFrameRateEnumsFromString(std::string readableString,
    }
 
    // find matching Videomode and Framerate by cycling brute force through our arrays
-   boolean found = false;
+   bool found = false;
    unsigned int counter = 0;
    while (!found && counter < g_NumVideoModes) {
       if (parts[0] == g_VideoModes[counter]) {

diff --git a/DeviceAdapters/SigmaKoki/Camera.cpp b/DeviceAdapters/SigmaKoki/Camera.cpp
@@ -1156,7 +1156,7 @@ int Camera::OnBinning(MM::PropertyBase* pProp, MM::ActionType eAct)
 {
 	BOOL ans = TRUE;
 	WORD mode = 0;
-	byte skippH, skippV, hBin, vBin;
+	BYTE skippH, skippV, hBin, vBin;
 
 	cout << "Product is   " << productName_ << endl;
 

diff --git a/MMDevice/DeviceUtils.cpp b/MMDevice/DeviceUtils.cpp
@@ -188,44 +188,3 @@ bool CDeviceUtils::CheckEnvironment(std::string env)
    }
    return bvalue;
 }
-
-
-
-#if defined(_WIN32) && !defined(MMDEVICE_NO_GETTIMEOFDAY)
-
-int gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-  FILETIME ft;
-  unsigned __int64 tmpres = 0;
-  static int tzflag;
-
-  if (NULL != tv)
-  {
-    GetSystemTimeAsFileTime(&ft);
-
-    tmpres |= ft.dwHighDateTime;
-    tmpres <<= 32;
-    tmpres |= ft.dwLowDateTime;
-
-    /*converting file time to unix epoch*/
-    tmpres -= DELTA_EPOCH_IN_MICROSECS; 
-    tmpres /= 10;  /*convert into microseconds*/
-    tv->tv_sec = (long)(tmpres / 1000000UL);
-    tv->tv_usec = (long)(tmpres % 1000000UL);
-  }
-
-  if (NULL != tz)
-  {
-    if (!tzflag)
-    {
-      _tzset();
-      tzflag++;
-    }
-    tz->tz_minuteswest = _timezone / 60;
-    tz->tz_dsttime = _daylight;
-  }
-
-  return 0;
-}
-
-#endif
diff --git a/MMDevice/DeviceUtils.h b/MMDevice/DeviceUtils.h
@@ -23,31 +23,6 @@
 #include "MMDeviceConstants.h"
 #include <vector>
 #include <string>
-#ifdef _WIN32
-#include <time.h>
-#include <windows.h>
-#endif
-
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif
-
-// Definition of struct timezone and gettimeofday can be disabled in case
-// interfacing with some other system that also tries to define conflicting
-// symbols (e.g. Python <= 3.6).
-#if defined(_WIN32) && !defined(MMDEVICE_NO_GETTIMEOFDAY)
-struct timezone 
-{
-  int  tz_minuteswest; /* minutes W of Greenwich */
-  int  tz_dsttime;     /* type of dst correction */
-};
-
-int gettimeofday(struct timeval *tv__, struct timezone *tz__);
-
-#endif
-
 
 class CDeviceUtils
 {