brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure to not include windows.h in simde

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-11-25 17:39:04 +00:00
parent 0e904c715a
commit c39e9f97ab
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/mingw-compat/condition_variable
View file

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

1
include/mingw-compat/future
View file

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

3
include/mingw-compat/mutex
View file

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

3
include/mingw-compat/thread
View file

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

12
include/simd-compat/pmmintrin.h
View file

@ -23,8 +23,20 @@
// bring in extra SSE3 support via simde // bring in extra SSE3 support via simde
# define SIMDE_X86_SSE2_NATIVE # define SIMDE_X86_SSE2_NATIVE
# define SIMDE_X86_SSE3_ENABLE_NATIVE_ALIASES # 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" # include "../simde/simde/x86/sse3.h"
# ifdef _WIN32_WAS_DEFINED
# define _WIN32
# undef _WIN32_WAS_DEFINED
# endif
#elif defined(__EMSCRIPTEN__) #elif defined(__EMSCRIPTEN__)
# include_next <pmmintrin.h> # include_next <pmmintrin.h>