diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-06-25 16:56:55 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-06-30 14:41:21 +0200 |
| commit | 50169c34511242987e6f2a047c79a0f7e1b7cfcc (patch) | |
| tree | da5ed5ad58448df5750308b7bd3312bf4f13f033 /erts/lib_src | |
| parent | 461dc05384eece7b4b7d84370fb0a2cf96ed2f6d (diff) | |
| download | otp-50169c34511242987e6f2a047c79a0f7e1b7cfcc.tar.gz otp-50169c34511242987e6f2a047c79a0f7e1b7cfcc.tar.bz2 otp-50169c34511242987e6f2a047c79a0f7e1b7cfcc.zip | |
erts: Separate ethread inlining from ethread.h
The commit adb5dc0090bc419e2c4c1250653badbddeb6263b (ETHR_FORCE_INLINE)
broke some platforms without adequate thread support.
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/Makefile.in | 1 | ||||
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/lib_src/Makefile.in b/erts/lib_src/Makefile.in index cf1aef518a..b680c03b1d 100644 --- a/erts/lib_src/Makefile.in +++ b/erts/lib_src/Makefile.in @@ -465,6 +465,7 @@ RELEASE_LIBS=$(ERTS_LIBS) INTERNAL_RELEASE_INCLUDES= \ $(ERTS_INCL_INT)/README \ $(ERTS_INCL_INT)/ethread.h \ + $(ERTS_INCL_INT)/ethread_inline.h \ $(ERTS_INCL_INT)/ethr_mutex.h \ $(ERTS_INCL_INT)/ethr_optimized_fallbacks.h \ $(ERTS_INCL_INT)/ethr_atomics.h \ diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 8bf7656bb0..d58a28b5cb 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -25,7 +25,7 @@ # include <windows.h> #endif -#include "ethread.h" +#include "ethread_inline.h" #include "erl_misc_utils.h" #if defined(__WIN32__) |