From b5ab81f3617bb9cb936beaacadae967d3c9ce541 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 12 Aug 2019 10:00:48 +0200 Subject: erts: Restructure include of hash.h to work with inline erl_child_setup is linked together with hash.o so we need to inline any functions into it when running in debug mode. --- erts/emulator/sys/unix/erl_child_setup.c | 5 ++++- erts/emulator/sys/unix/sys_drivers.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'erts/emulator/sys/unix') diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c index 9241660069..8f261761db 100644 --- a/erts/emulator/sys/unix/erl_child_setup.c +++ b/erts/emulator/sys/unix/erl_child_setup.c @@ -63,10 +63,13 @@ #include "erl_driver.h" #include "sys_uds.h" -#include "hash.h" #include "erl_term.h" #include "erl_child_setup.h" +#undef ERTS_GLB_INLINE_INCL_FUNC_DEF +#define ERTS_GLB_INLINE_INCL_FUNC_DEF 1 +#include "hash.h" + #define SET_CLOEXEC(fd) fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC) #if defined(__ANDROID__) diff --git a/erts/emulator/sys/unix/sys_drivers.c b/erts/emulator/sys/unix/sys_drivers.c index 92020c6f35..870d0bd28a 100644 --- a/erts/emulator/sys/unix/sys_drivers.c +++ b/erts/emulator/sys/unix/sys_drivers.c @@ -55,6 +55,7 @@ #define WANT_NONBLOCKING /* must define this to pull in defs from sys.h */ #include "sys.h" +#include "erl_osenv.h" #include "erl_threads.h" -- cgit v1.2.3