diff options
author | Lukas Larsson <[email protected]> | 2016-07-14 16:19:10 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-07-14 16:19:10 +0200 |
commit | 0737ad60e3ab97aa481d63c17eebafe1f2bddd55 (patch) | |
tree | f148fac63eb7ddbf69c436bfbb395c1df345329d /erts/emulator/beam/hash.h | |
parent | f7b0cbbab08f2d3f733dfe2e201ce0ff614daaf3 (diff) | |
parent | 571776ede924840f2a70681764031ca3372dd919 (diff) | |
download | otp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.tar.gz otp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.tar.bz2 otp-0737ad60e3ab97aa481d63c17eebafe1f2bddd55.zip |
Merge branch 'lukas/erts/dirty_msacc_cleanup/OTP-13744' into maint
* lukas/erts/dirty_msacc_cleanup/OTP-13744:
erts: Update msacc docs with dirty scheduler info
erts: Cleanup a bunch of un-neccesary #ifndefs
erts: Fix some msacc inline directives
erts: Add extra bif msacc states
erts: Add erts_map_from_ks_and_vs
erts: Fix msacc for dirty scheduler and heap_limit
Diffstat (limited to 'erts/emulator/beam/hash.h')
-rw-r--r-- | erts/emulator/beam/hash.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/erts/emulator/beam/hash.h b/erts/emulator/beam/hash.h index 9f773d8faa..4e769c0119 100644 --- a/erts/emulator/beam/hash.h +++ b/erts/emulator/beam/hash.h @@ -25,9 +25,7 @@ #ifndef __HASH_H__ #define __HASH_H__ -#ifndef __SYS_H__ #include "sys.h" -#endif typedef unsigned long HashValue; typedef struct hash Hash; |