aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include/internal
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-11-12 10:28:32 +0100
committerDan Gudmundsson <[email protected]>2015-11-12 10:28:32 +0100
commitb179d2bfb775b12e51ceefca9a8bc63dc2260f54 (patch)
tree3a3f961c6c243e18e65dcda3e1baa59fdb12eeb1 /erts/include/internal
parent98e1d3394514181648c64ab9e5f7a1af2573d658 (diff)
downloadotp-b179d2bfb775b12e51ceefca9a8bc63dc2260f54.tar.gz
otp-b179d2bfb775b12e51ceefca9a8bc63dc2260f54.tar.bz2
otp-b179d2bfb775b12e51ceefca9a8bc63dc2260f54.zip
win32: Fix mixed cygwin and msys configure tests
And test for mixed msys in emulator
Diffstat (limited to 'erts/include/internal')
-rw-r--r--erts/include/internal/ethread.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h
index f9c203e97c..8964f95652 100644
--- a/erts/include/internal/ethread.h
+++ b/erts/include/internal/ethread.h
@@ -54,7 +54,8 @@
#endif
#if defined(ETHR_DEBUG) || !defined(ETHR_INLINE) || ETHR_XCHK \
- || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC))
+ || (defined(__GNUC__) && defined(ERTS_MIXED_CYGWIN_VC)) \
+ || (defined(__GNUC__) && defined(ERTS_MIXED_MSYS_VC))
# undef ETHR_INLINE
# define ETHR_INLINE
# undef ETHR_FORCE_INLINE