make sure to not include windows.h in simde

Signed-off-by: falkTX <[email protected]>
DISTRHO · Nov 25, 2022 · c39e9f9 · c39e9f9
1 parent 0e904c7
commit c39e9f9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/include/mingw-compat/condition_variable b/include/mingw-compat/condition_variable
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021 Filipe Coelho <[email protected]>
+ * Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,6 +19,7 @@
 #include_next <condition_variable>
 #include "mingw.condition_variable.h"
 
+// fix macro pollution from Windows headers
 #undef IN
 #undef OUT
 #undef far

diff --git a/include/mingw-compat/future b/include/mingw-compat/future
@@ -19,6 +19,7 @@
 #include_next <future>
 #include "mingw.future.h"
 
+// fix macro pollution from Windows headers
 #undef IN
 #undef OUT
 #undef far

diff --git a/include/mingw-compat/mutex b/include/mingw-compat/mutex
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021 Filipe Coelho <[email protected]>
+ * Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,6 +19,7 @@
 #include_next <mutex>
 #include "mingw.mutex.h"
 
+// fix macro pollution from Windows headers
 #undef IN
 #undef OUT
 #undef far

diff --git a/include/mingw-compat/thread b/include/mingw-compat/thread
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021 Filipe Coelho <[email protected]>
+ * Copyright (C) 2021-2022 Filipe Coelho <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,6 +19,7 @@
 #include_next <thread>
 #include "mingw.thread.h"
 
+// fix macro pollution from Windows headers
 #undef IN
 #undef OUT
 #undef far

diff --git a/include/simd-compat/pmmintrin.h b/include/simd-compat/pmmintrin.h
@@ -23,8 +23,20 @@
 // bring in extra SSE3 support via simde
 # define SIMDE_X86_SSE2_NATIVE
 # define SIMDE_X86_SSE3_ENABLE_NATIVE_ALIASES
+
+// make sure to not include windows.h here
+# ifdef _WIN32
+#  define _WIN32_WAS_DEFINED
+#  undef _WIN32
+# endif
+
 # include "../simde/simde/x86/sse3.h"
 
+# ifdef _WIN32_WAS_DEFINED
+#  define _WIN32
+#  undef _WIN32_WAS_DEFINED
+# endif
+
 #elif defined(__EMSCRIPTEN__)
 # include_next <pmmintrin.h>