aboutsummaryrefslogtreecommitdiffstats
path: root/erts/include/internal
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-11-23 12:46:39 +0100
committerDan Gudmundsson <[email protected]>2015-11-23 12:46:39 +0100
commitba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de (patch)
tree97a47d463b5110b8e439b434734feb9227f0897f /erts/include/internal
parentedc7104f0b07ced272723fc9a74469fe8310f965 (diff)
parentb179d2bfb775b12e51ceefca9a8bc63dc2260f54 (diff)
downloadotp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.tar.gz
otp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.tar.bz2
otp-ba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de.zip
Merge branch 'dgud/erts/fix-mixed-msys-cygwin' into maint
* dgud/erts/fix-mixed-msys-cygwin: win32: Fix mixed cygwin and msys configure tests
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