diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-11-27 12:18:49 +0100 |
| commit | 80bbe3b23ad7781e43dfea3a84203956ccab6a10 (patch) | |
| tree | d038b2b296d373ca55818cdb7b7688f95dbf566f /erts/etc | |
| parent | 29f453a3b2af49cd8f2052959262fc3be8971c46 (diff) | |
| parent | b916edc72a8eb82068229222abde1b9ff43dbad2 (diff) | |
| download | otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.gz otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.tar.bz2 otp-80bbe3b23ad7781e43dfea3a84203956ccab6a10.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index c9f5fd66a1..7b0fe46a01 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -73,6 +73,7 @@ static const char plusM_au_allocs[]= { 'R', /* driver_alloc */ 'S', /* sl_alloc */ 'T', /* temp_alloc */ + 'Z', /* test_alloc */ '\0' }; |