diff options
| author | Sverker Eriksson <[email protected]> | 2016-02-08 18:00:45 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-02-08 18:00:45 +0100 |
| commit | 6392637b184ac3172c61025889f3087e5739bb72 (patch) | |
| tree | 7defce40c56982e16580c15a607dc3e0048a81c2 /erts/emulator/beam/global.h | |
| parent | fcb5fc90e891d56b83927c8403d97da0faca0e41 (diff) | |
| parent | e9d6797e15e687828e5ef0d33fb790181d657779 (diff) | |
| download | otp-6392637b184ac3172c61025889f3087e5739bb72.tar.gz otp-6392637b184ac3172c61025889f3087e5739bb72.tar.bz2 otp-6392637b184ac3172c61025889f3087e5739bb72.zip | |
Merge branch 'sverk/thread-unsafe-alloc'
* sverk/thread-unsafe-alloc:
erts: Fix faulty assert for non-smp
erts: Add checks for thread safe allocation
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index e8a7573e86..4247b25ab1 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1168,6 +1168,9 @@ extern ErtsModifiedTimings erts_modified_timings[]; extern int erts_no_line_info; extern Eterm erts_error_logger_warnings; extern int erts_initialized; +#if defined(USE_THREADS) && !defined(ERTS_SMP) +extern erts_tid_t erts_main_thread; +#endif extern int erts_compat_rel; extern int erts_use_sender_punish; void erts_short_init(void); |