compilation fixes Windows

Author: jvde-github

Library/ADSB.h

@@ -22,8 +22,8 @@ namespace Plane
 
     enum class BoolType
     {
-        FALSE = 0,
-        TRUE = 1,
+        IS_FALSE = 0,
+        IS_TRUE = 1,
         UNKNOWN = 2
     };
 

Library/Basestation.h

@@ -22,9 +22,7 @@
 #include "Message.h"
 #include "Stream.h"
 
-#include "JSON/JSON.h"
-#include "JSON/Parser.h"
-#include "JSON/StringBuilder.h"
+#include "Utilities.h"
 #include "Keys.h"
 #include "ADSB.h"
 
@@ -82,10 +80,8 @@ class Basestation : public SimpleStreamInOut<RAW, Plane::ADSB>
         // Timestamps (Fields 7-10)
         if (!fields[6].empty() && !fields[7].empty())
         {
-            struct tm tm = {};
             std::string datetime = fields[6] + " " + fields[7];
-            strptime(datetime.c_str(), "%Y/%m/%d %H:%M:%S", &tm);
-            msg.setRxTimeUnix(mktime(&tm));
+            msg.setRxTimeUnix(Util::Parse::DateTime(datetime));
         }
 
         // Callsign (Field 10)

Library/Utilities.cpp

@@ -16,6 +16,7 @@
 */
 
 #include <iomanip>
+#include <string>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -106,8 +107,6 @@ namespace Util
 		return number;
 	}
 
-#include <string>
-
 	void Parse::URL(const std::string &url, std::string &protocol, std::string &username, std::string &password, std::string &host, std::string &port, std::string &path)
 	{
 		std::string s = url;
@@ -381,6 +380,25 @@ namespace Util
 		}
 	}
 
+#ifdef _WIN32
+	std::time_t Parse::DateTime(const std::string &datetime)
+	{
+		std::tm tm = {};
+		std::istringstream ss(datetime);
+		ss >> std::get_time(&tm, "%Y/%m/%d %H:%M:%S");
+		if (ss.fail())
+			return 0;
+		return _mkgmtime(&tm);
+	}
+#else
+	std::time_t Parse::DateTime(const std::string &datetime)
+	{
+		std::tm tm = {};
+		strptime(datetime.c_str(), "%Y/%m/%d %H:%M:%S", &tm);
+		return timegm(&tm);
+	}
+#endif
+
 	bool Parse::Switch(std::string arg, const std::string &TrueString, const std::string &FalseString)
 	{
 		Util::Convert::toUpper(arg);

Library/Utilities.h

@@ -142,7 +142,7 @@ namespace Util
 		static bool Protocol(std::string str, PROTOCOL &protocol);
 		static bool OutputFormat(std::string str, MessageFormat &out);
 		static std::string DeviceTypeString(Type type);
-
+		static std::time_t DateTime(const std::string& datetime);
 		static bool Switch(std::string arg, const std::string &TrueString = "ON", const std::string &FalseString = "OFF");
 		static bool AutoInteger(std::string arg, int min, int max, int &val);
 		static bool AutoFloat(std::string arg, double min, double max, double &val);

msvc/AIS-catcher RTLSDR.vcxproj

@@ -57,6 +57,7 @@
     <ClCompile Include="..\Library\Message.cpp" />
     <ClCompile Include="..\Library\JSONAIS.cpp" />
     <ClCompile Include="..\Library\NMEA.cpp" />
+    <ClCompile Include="..\Library\Basestation.cpp" />
     <ClCompile Include="..\Library\Logger.cpp" />
     <ClCompile Include="..\Library\TCP.cpp" />
     <ClCompile Include="..\Library\Utilities.cpp" />
@@ -111,6 +112,8 @@
     <ClInclude Include="..\Library\Stream.h" />
     <ClInclude Include="..\Library\NMEA.h" />
     <ClInclude Include="..\Library\TCP.h" />
+    <ClInclude Include="..\Library\ADSB.h" />
+    <ClInclude Include="..\Library\Basestation.h" />
     <ClInclude Include="..\Library\Logger.h" />
     <ClInclude Include="..\Library\Utilities.h" />
     <ClInclude Include="..\Protocol\Protocol.h" />