diff options
| author | Zandra Hird <[email protected]> | 2015-03-06 12:04:53 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-06 12:04:53 +0100 |
| commit | 86ce4d658f9a11dbfc3d6ffe0a8be50c33807210 (patch) | |
| tree | f131064cd8f82f88ce31d5545cc03e15daf0f86e | |
| parent | ebf2429777e6aa6739ea600944ac209fc513940f (diff) | |
| parent | c312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7 (diff) | |
| download | otp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.tar.gz otp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.tar.bz2 otp-86ce4d658f9a11dbfc3d6ffe0a8be50c33807210.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/emulator/beam/external.h | 1 | ||||
| -rw-r--r-- | system/doc/reference_manual/data_types.xml | 3 |
2 files changed, 2 insertions, 2 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 *); diff --git a/system/doc/reference_manual/data_types.xml b/system/doc/reference_manual/data_types.xml index 37c0db5ff7..ad92143179 100644 --- a/system/doc/reference_manual/data_types.xml +++ b/system/doc/reference_manual/data_types.xml @@ -44,7 +44,8 @@ <list type="bulleted"> <item><c>$</c><em><c>char</c></em> <br></br> - ASCII value of the character <em><c>char</c></em>.</item> + ASCII value or unicode code-point of the character + <em><c>char</c></em>.</item> <item><em><c>base</c></em><c>#</c><em><c>value</c></em> <br></br> Integer with the base <em><c>base</c></em>, which must be an |