diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2019-11-14 09:20:02 +0100 |
| commit | afb9501f99bf94b05f999cd341dade721f69d023 (patch) | |
| tree | ea7108658df4152cfbde5e84bf010045dac6ff58 /erts/include | |
| parent | 9adc0b044a1e2a01537775b8076bee29586b4870 (diff) | |
| parent | 78354470a93df501d7803d3a3e51f199ec8c9475 (diff) | |
| download | erlang-afb9501f99bf94b05f999cd341dade721f69d023.tar.gz | |
Merge branch 'dgud/cleanup-windows-build'
* dgud/cleanup-windows-build:
Refactor otp_build env_win32
Speedup depend.mk creation
Refactor win32 configure handling
Diffstat (limited to 'erts/include')
| -rw-r--r-- | erts/include/internal/ethread.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index fa35bf3d0b..2fe826226c 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -54,8 +54,7 @@ #endif #if defined(ETHR_DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \ - || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) \ - || (defined(__GNUC__) && defined(ERTS_MIXED_MSYS_VC)) + || (defined(__GNUC__) && defined(ERTS_MIXED_VC)) # undef ETHR_INLINE # define ETHR_INLINE # undef ETHR_FORCE_INLINE |