diff options
| author | Lukas Larsson <[email protected]> | 2019-08-12 10:00:48 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-08-13 08:09:40 +0200 |
| commit | b5ab81f3617bb9cb936beaacadae967d3c9ce541 (patch) | |
| tree | b8bbe5e03b7ef696673afc8e9c9cb96eb4f1f797 /erts/emulator/sys | |
| parent | 18e2d852469fc3c3cdf287de5ca1ed4c73c71c4d (diff) | |
| download | otp-b5ab81f3617bb9cb936beaacadae967d3c9ce541.tar.gz otp-b5ab81f3617bb9cb936beaacadae967d3c9ce541.tar.bz2 otp-b5ab81f3617bb9cb936beaacadae967d3c9ce541.zip | |
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.
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/common/erl_osenv.h | 10 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/erl_child_setup.c | 5 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys_drivers.c | 1 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys.c | 1 | ||||
| -rw-r--r-- | erts/emulator/sys/win32/sys_env.c | 1 |
5 files changed, 9 insertions, 9 deletions
diff --git a/erts/emulator/sys/common/erl_osenv.h b/erts/emulator/sys/common/erl_osenv.h index 4777f2148a..f2e96a6af7 100644 --- a/erts/emulator/sys/common/erl_osenv.h +++ b/erts/emulator/sys/common/erl_osenv.h @@ -35,16 +35,10 @@ # include "config.h" #endif -typedef struct __erts_osenv_data_t erts_osenv_data_t; - -typedef struct __erts_osenv_t { - struct __env_rbtnode_t *tree; - int variable_count; - int content_size; -} erts_osenv_t; - #include "sys.h" +typedef struct __erts_osenv_data_t erts_osenv_data_t; + struct __erts_osenv_data_t { Sint length; void *data; 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" diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index b95aadc9b2..bc3de42be7 100644 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -27,6 +27,7 @@ #endif #include "sys.h" +#include "erl_osenv.h" #include "erl_alloc.h" #include "erl_sys_driver.h" #include "global.h" diff --git a/erts/emulator/sys/win32/sys_env.c b/erts/emulator/sys/win32/sys_env.c index c78161b344..36223c2c14 100644 --- a/erts/emulator/sys/win32/sys_env.c +++ b/erts/emulator/sys/win32/sys_env.c @@ -23,6 +23,7 @@ #endif #include "sys.h" +#include "erl_osenv.h" #include "erl_sys_driver.h" #include "erl_alloc.h" |