aboutsummaryrefslogtreecommitdiffstats
path: root/erts/lib_src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-07-01 13:58:34 +0200
committerErlang/OTP <[email protected]>2014-07-01 13:58:34 +0200
commit2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8 (patch)
tree56650b96db143ef382560a48a27e8f9669a80197 /erts/lib_src
parent53f1678f15871505211ba574573247acc37ebb60 (diff)
parentfbb4d5a85baaeb0a946a00e5994fc1f4a12b2855 (diff)
downloadotp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.gz
otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.tar.bz2
otp-2387c54c1ffe02a5f7f1d9a097c6aa71553a16b8.zip
Merge branch 'egil/fix-ethr-force-inline/OTP-12010' into maint-17
* egil/fix-ethr-force-inline/OTP-12010: vxworks: Fix SYSTEMD_DAEMON_LIBS in configure erts: Separate ethread inlining from ethread.h
Diffstat (limited to 'erts/lib_src')
-rw-r--r--erts/lib_src/Makefile.in1
-rw-r--r--erts/lib_src/common/erl_misc_utils.c2
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__)