summaryrefslogtreecommitdiff
path: root/erts/include
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2019-09-09 17:16:36 +0200
committerDan Gudmundsson <dgud@erlang.org>2019-11-12 07:34:17 +0100
commita314e2768dd5c64950c48b24f32a0eec62ded385 (patch)
tree9c83b068c0e5f7bb1d8aa223b03562b7e223ee16 /erts/include
parent5b8e5e0d27fcbebee51ae0e714cbe97630405904 (diff)
downloaderlang-a314e2768dd5c64950c48b24f32a0eec62ded385.tar.gz
Refactor win32 configure handling
There are a lot of MIXED_* options and adding a another mode for WSL will make things worse, thus a cleanup is done first. This commit consolidates the handling for the Makefiles, src and scripts and moves the funcionality into similar named wrapper-scripts instead. Path conversion is done with a script 'w32_path.sh' and registry lookups with 'reg_query.sh'. Path to the wrapper scripts is setup with: otp_build env_win32 <arch>.
Diffstat (limited to 'erts/include')
-rw-r--r--erts/include/internal/ethread.h3
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