Browse Source

make sure to not include windows.h in simde

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.11
falkTX 2 years ago
parent
commit
c39e9f97ab
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 19 additions and 3 deletions
  1. +2
    -1
      include/mingw-compat/condition_variable
  2. +1
    -0
      include/mingw-compat/future
  3. +2
    -1
      include/mingw-compat/mutex
  4. +2
    -1
      include/mingw-compat/thread
  5. +12
    -0
      include/simd-compat/pmmintrin.h

+ 2
- 1
include/mingw-compat/condition_variable View File

@@ -1,6 +1,6 @@
/*
* 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
* 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


+ 1
- 0
include/mingw-compat/future View File

@@ -19,6 +19,7 @@
#include_next <future>
#include "mingw.future.h"

// fix macro pollution from Windows headers
#undef IN
#undef OUT
#undef far


+ 2
- 1
include/mingw-compat/mutex View File

@@ -1,6 +1,6 @@
/*
* 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
* 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


+ 2
- 1
include/mingw-compat/thread View File

@@ -1,6 +1,6 @@
/*
* 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
* 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


+ 12
- 0
include/simd-compat/pmmintrin.h View File

@@ -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>



Loading…
Cancel
Save