diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 21:08:52 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-24 16:22:30 +0200 |
| commit | 16b83562b0d2e9f9892744dcbf7894ef7d18a82a (patch) | |
| tree | 8c214fd21194479137783f396b955de5af312c72 /erts/emulator | |
| parent | 49e744df7a31e329c03567f3bd7cfb72e4a555d2 (diff) | |
| download | otp-16b83562b0d2e9f9892744dcbf7894ef7d18a82a.tar.gz otp-16b83562b0d2e9f9892744dcbf7894ef7d18a82a.tar.bz2 otp-16b83562b0d2e9f9892744dcbf7894ef7d18a82a.zip | |
erts: Remove halfword in erl_nif.h
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_nif.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/erts/emulator/beam/erl_nif.h b/erts/emulator/beam/erl_nif.h index 7d880126f8..5da6bb877a 100644 --- a/erts/emulator/beam/erl_nif.h +++ b/erts/emulator/beam/erl_nif.h @@ -86,10 +86,6 @@ # define SIZEOF_LONG_LONG_SAVED__ SIZEOF_LONG_LONG # undef SIZEOF_LONG_LONG #endif -#ifdef HALFWORD_HEAP_EMULATOR -# define HALFWORD_HEAP_EMULATOR_SAVED__ HALFWORD_HEAP_EMULATOR -# undef HALFWORD_HEAP_EMULATOR -#endif #include "erl_int_sizes_config.h" #ifdef __cplusplus @@ -109,16 +105,11 @@ typedef long long ErlNifSInt64; #error No 64-bit integer type #endif -#ifdef HALFWORD_HEAP_EMULATOR -# define ERL_NIF_VM_VARIANT "beam.halfword" -typedef unsigned int ERL_NIF_TERM; -#else -# define ERL_NIF_VM_VARIANT "beam.vanilla" -# if SIZEOF_LONG == SIZEOF_VOID_P +#define ERL_NIF_VM_VARIANT "beam.vanilla" +#if SIZEOF_LONG == SIZEOF_VOID_P typedef unsigned long ERL_NIF_TERM; -# elif SIZEOF_LONG_LONG == SIZEOF_VOID_P +#elif SIZEOF_LONG_LONG == SIZEOF_VOID_P typedef unsigned long long ERL_NIF_TERM; -# endif #endif typedef ERL_NIF_TERM ERL_NIF_UINT; |