61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
diff -Naur libicsneo-orig/platform/windows/pcap.cpp libicsneo/platform/windows/pcap.cpp
|
|
--- libicsneo-orig/platform/windows/pcap.cpp 2018-12-28 10:06:36.876342200 +0300
|
|
+++ libicsneo/platform/windows/pcap.cpp 2018-12-28 12:45:16.975152000 +0300
|
|
@@ -8,7 +8,11 @@
|
|
#include <chrono>
|
|
#include <iostream>
|
|
#include <locale>
|
|
+#include <vector>
|
|
|
|
+#ifdef __MINGW32__
|
|
+#undef interface
|
|
+#endif
|
|
using namespace icsneo;
|
|
|
|
|
|
diff -Naur libicsneo-orig/include/icsneo/platform/windows/registry.h libicsneo/include/icsneo/platform/windows/registry.h
|
|
--- libicsneo-orig/include/icsneo/platform/windows/registry.h 2018-12-28 10:06:36.876342200 +0300
|
|
+++ libicsneo/include/icsneo/platform/windows/registry.h 2018-12-28 12:45:16.975152000 +0300
|
|
@@ -3,6 +3,7 @@
|
|
|
|
#ifdef __cplusplus
|
|
|
|
+#include <cstdint>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
diff -Naur libicsneo-orig/platform/windows/registry.cpp libicsneo/platform/windows/registry.cpp
|
|
--- libicsneo-orig/platform/windows/registry.cpp 2018-12-28 10:06:36.876342200 +0300
|
|
+++ libicsneo/platform/windows/registry.cpp 2018-12-28 12:45:59.376026400 +0300
|
|
@@ -1,5 +1,6 @@
|
|
#include "icsneo/platform/windows/registry.h"
|
|
#include <codecvt>
|
|
+#include <locale>
|
|
#include <vector>
|
|
|
|
using namespace icsneo;
|
|
diff -Naur libicsneo-orig/device/device.cpp libicsneo/device/device.cpp
|
|
--- libicsneo-orig/device/device.cpp 2018-12-28 10:06:36.876342200 +0300
|
|
+++ libicsneo/device/device.cpp 2018-12-28 12:45:59.376026400 +0300
|
|
@@ -1943,7 +1943,7 @@
|
|
stdTime.tm_wday = time->DOW;
|
|
// RTCCTIME struct has no member for `tm_yday`
|
|
|
|
- #ifdef _MSC_VER
|
|
+ #ifdef _WIN32
|
|
#define timegm _mkgmtime
|
|
#endif
|
|
|
|
diff -Naur libicsneo-orig/api/icsneolegacy/icsneolegacy.cpp libicsneo/api/icsneolegacy/icsneolegacy.cpp
|
|
--- libicsneo-orig/api/icsneolegacy/icsneolegacy.cpp 2018-12-28 10:06:36.876342200 +0300
|
|
+++ libicsneo/api/icsneolegacy/icsneolegacy.cpp 2018-12-28 12:45:59.376026400 +0300
|
|
@@ -596,7 +596,7 @@
|
|
timeInfo.tm_mon = time->month - 1;
|
|
timeInfo.tm_year = time->year + 100;
|
|
|
|
- #ifdef _MSC_VER
|
|
+ #ifdef _WIN32
|
|
#define timegm _mkgmtime
|
|
#endif
|
|
|