diff options
| author | Erlang/OTP <[email protected]> | 2010-02-03 10:36:00 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-02-03 10:36:00 +0000 |
| commit | b431080a98aa625758e41989437219357392ffb6 (patch) | |
| tree | 73e598272c827055e015e3465451cf37e7a6b5a2 /erts/emulator/beam/external.c | |
| parent | 05f4ff85cb00b15b07b1ed194185fd37017ce7b9 (diff) | |
| parent | 489577676f14d5ee62459f9134095d982a08e430 (diff) | |
| download | otp-b431080a98aa625758e41989437219357392ffb6.tar.gz otp-b431080a98aa625758e41989437219357392ffb6.tar.bz2 otp-b431080a98aa625758e41989437219357392ffb6.zip | |
Merge branch 'jb/atom-table-size' into ccase/r13b04_dev
* jb/atom-table-size:
Add the +t emulator option to change the maximum number of atoms
OTP-8405 There is a new +t emulator option for changing the maximum number
of atoms. (Thanks to Julien Barbot.)
Diffstat (limited to 'erts/emulator/beam/external.c')
| -rw-r--r-- | erts/emulator/beam/external.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c index 24887b3dea..b011d4c0de 100644 --- a/erts/emulator/beam/external.c +++ b/erts/emulator/beam/external.c @@ -271,11 +271,8 @@ erts_encode_ext_dist_header_size(ErtsAtomCacheMap *acmp) byte *erts_encode_ext_dist_header_setup(byte *ctl_ext, ErtsAtomCacheMap *acmp) { -#ifndef ARCH_32 -#if ATOM_LIMIT >= (1UL << 32) -#error "ATOM_LIMIT too large for interal atom cache update instructions. New instructions needed." -#endif -#endif + /* Maximum number of atom must be less than the maximum of a 32 bits + unsigned integer. Check is done in erl_init.c, erl_start function. */ if (!acmp) return ctl_ext; else { |