From f144f8a0b907e5573230fd23c4c11c931f94276b Mon Sep 17 00:00:00 2001
From: onryo <onryo@hush.land>
Date: Thu, 26 Sep 2024 05:04:55 +0200
Subject: [PATCH 1/3] Fix fatal error and the version flag option when
 compiling for windows

---
 depends/hosts/mingw32.mk | 2 +-
 src/sync.cpp             | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index c80d14184..1a65bd346 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -1,6 +1,6 @@
 mingw32_CC=x86_64-w64-mingw32-gcc-posix
 mingw32_CXX=x86_64-w64-mingw32-g++-posix
-mingw32_CFLAGS=-pipe -std=c11
+mingw32_CFLAGS=-pipe -std=c++11
 mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11
 
 mingw32_release_CFLAGS=-O3
diff --git a/src/sync.cpp b/src/sync.cpp
index 632c5562e..6f9ae5768 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -25,7 +25,13 @@
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 
-#include <execinfo.h> /* backtrace, backtrace_symbols_fd */
+#ifdef _WIN32
+#include <windows.h>
+#include <dbghelp.h>
+#else
+#include <execinfo.h>
+#endif
+
 #include <unistd.h> /* STDOUT_FILENO */
 
 

From e68795f4f97d637cc2ba9c35ab43b198541cdd91 Mon Sep 17 00:00:00 2001
From: onryo <onryo@hush.land>
Date: Fri, 27 Sep 2024 22:39:32 +0200
Subject: [PATCH 2/3] Revert "Fix fatal error and the version flag option when
 compiling for windows"

This reverts commit f144f8a0b907e5573230fd23c4c11c931f94276b.
---
 depends/hosts/mingw32.mk | 2 +-
 src/sync.cpp             | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/depends/hosts/mingw32.mk b/depends/hosts/mingw32.mk
index 1a65bd346..c80d14184 100644
--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@@ -1,6 +1,6 @@
 mingw32_CC=x86_64-w64-mingw32-gcc-posix
 mingw32_CXX=x86_64-w64-mingw32-g++-posix
-mingw32_CFLAGS=-pipe -std=c++11
+mingw32_CFLAGS=-pipe -std=c11
 mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11
 
 mingw32_release_CFLAGS=-O3
diff --git a/src/sync.cpp b/src/sync.cpp
index 6f9ae5768..632c5562e 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -25,13 +25,7 @@
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 
-#ifdef _WIN32
-#include <windows.h>
-#include <dbghelp.h>
-#else
-#include <execinfo.h>
-#endif
-
+#include <execinfo.h> /* backtrace, backtrace_symbols_fd */
 #include <unistd.h> /* STDOUT_FILENO */
 
 

From be5a78931bd12f12b0f8e7fc4730728df71aa240 Mon Sep 17 00:00:00 2001
From: onryo <onryo@hush.land>
Date: Fri, 27 Sep 2024 22:40:46 +0200
Subject: [PATCH 3/3] Fix fatal error when compiling for windows on dev

---
 src/sync.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sync.cpp b/src/sync.cpp
index 632c5562e..16c4c86a2 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -25,9 +25,14 @@
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 
+#ifdef _WIN32
+#include <windows.h>
+#include <dbghelp.h>
+#else
 #include <execinfo.h> /* backtrace, backtrace_symbols_fd */
-#include <unistd.h> /* STDOUT_FILENO */
+#endif
 
+#include <unistd.h> /* STDOUT_FILENO */
 
 #ifdef DEBUG_LOCKCONTENTION
 void PrintLockContention(const char* pszName, const char* pszFile, int nLine)