From b179d2bfb775b12e51ceefca9a8bc63dc2260f54 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Thu, 12 Nov 2015 10:28:32 +0100 Subject: win32: Fix mixed cygwin and msys configure tests And test for mixed msys in emulator --- erts/include/internal/ethread.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'erts/include') 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 -- cgit v1.2.3