aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-06 12:04:53 +0100
committerZandra Hird <[email protected]>2015-03-06 12:04:53 +0100
commit86ce4d658f9a11dbfc3d6ffe0a8be50c33807210 (patch)
treef131064cd8f82f88ce31d5545cc03e15daf0f86e /erts
parentebf2429777e6aa6739ea600944ac209fc513940f (diff)
parentc312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7 (diff)
downloadotp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.tar.gz
otp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.tar.bz2
otp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/external.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index f120e96e3b..50fcfa04d6 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -157,7 +157,6 @@ void erts_init_atom_cache_map(ErtsAtomCacheMap *);
void erts_reset_atom_cache_map(ErtsAtomCacheMap *);
void erts_destroy_atom_cache_map(ErtsAtomCacheMap *);
void erts_finalize_atom_cache_map(ErtsAtomCacheMap *, Uint32);
-Uint erts_encode_ext_dist_header_size(ErtsAtomCacheMap *);
Uint erts_encode_ext_dist_header_size(ErtsAtomCacheMap *);
byte *erts_encode_ext_dist_header_setup(byte *, ErtsAtomCacheMap *);