From d189145a01ac43956827dd9be022dbd1a3191c49 Mon Sep 17 00:00:00 2001
From: qruf <work@b23.be>
Date: Sat, 16 Sep 2023 20:15:31 +0100
Subject: [PATCH] build: fixes for mingw support (#373)

---
 common/cmdlib.cc          | 8 ++++----
 common/threads.cc         | 2 +-
 include/common/cmdlib.hh  | 1 +
 include/common/mathlib.hh | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/cmdlib.cc b/common/cmdlib.cc
index 059d68e6..4beae64b 100644
--- a/common/cmdlib.cc
+++ b/common/cmdlib.cc
@@ -707,8 +707,8 @@ bool need_swap(std::ios_base &os)
 
 void *q_aligned_malloc(size_t align, size_t size)
 {
-#ifdef _mm_malloc
-    return _mm_malloc(size, align);
+#ifdef _WIN32
+    return _aligned_malloc(size, align);
 #elif __STDC_VERSION__ >= 201112L
     return aligned_alloc(align, size);
 #else
@@ -722,8 +722,8 @@ void *q_aligned_malloc(size_t align, size_t size)
 
 void q_aligned_free(void *ptr)
 {
-#ifdef _mm_malloc
-    _mm_free(ptr);
+#ifdef _WIN32
+    _aligned_free(ptr);
 #else
     free(ptr);
 #endif
diff --git a/common/threads.cc b/common/threads.cc
index e481c3aa..ee5c2aef 100644
--- a/common/threads.cc
+++ b/common/threads.cc
@@ -6,7 +6,7 @@
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 static std::unique_ptr<tbb::global_control> tbbGlobalControl;
diff --git a/include/common/cmdlib.hh b/include/common/cmdlib.hh
index 4424ffd6..4986d1a8 100644
--- a/include/common/cmdlib.hh
+++ b/include/common/cmdlib.hh
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <array>
+#include <cstdint>
 #include <cstring> // for memcpy()
 #include <string>
 #include <string_view>
diff --git a/include/common/mathlib.hh b/include/common/mathlib.hh
index 1507f112..a58ba3a3 100644
--- a/include/common/mathlib.hh
+++ b/include/common/mathlib.hh
@@ -21,6 +21,7 @@
 
 #include <cfloat>
 #include <cmath>
+#include <cstdint>
 #include <vector>
 #include <algorithm>