diff options
| author | Rickard Green <[email protected]> | 2017-02-06 17:06:40 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-06 17:06:40 +0100 |
| commit | e3f2ac81039f713d2b685130e8709274b87371ac (patch) | |
| tree | e44de180b8ad7bb0e760d9b466e05b1dd405cdba /erts/emulator/beam/erl_init.c | |
| parent | 77a9b8c6fe331761a89d48419ee2200ba5377e49 (diff) | |
| parent | c95e126ab3d4fbf38ef6cb9694da079d895ffa68 (diff) | |
| download | otp-e3f2ac81039f713d2b685130e8709274b87371ac.tar.gz otp-e3f2ac81039f713d2b685130e8709274b87371ac.tar.bz2 otp-e3f2ac81039f713d2b685130e8709274b87371ac.zip | |
Merge branch 'maint'
* maint:
Use a hole-marker that cannot be mistaken for a valid term on the heap
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 88bd002a8c..0646665b07 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -117,6 +117,11 @@ const int etp_big_endian = 1; const int etp_big_endian = 0; #endif const Eterm etp_the_non_value = THE_NON_VALUE; +#ifdef ERTS_HOLE_MARKER +const Eterm etp_hole_marker = ERTS_HOLE_MARKER; +#else +const Eterm etp_hole_marker = 0; +#endif /* * Note about VxWorks: All variables must be initialized by executable code, |