diff options
| author | Zandra Hird <[email protected]> | 2015-03-06 12:03:46 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-06 12:04:21 +0100 |
| commit | c312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7 (patch) | |
| tree | 0017debb7e05cf0e1cfe9602c0d826848236033b | |
| parent | 801b09af301a872170e44c215e274425c46f8d24 (diff) | |
| parent | c472fc520fc30d6d19adc89bdc42817870274db2 (diff) | |
| download | otp-c312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7.tar.gz otp-c312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7.tar.bz2 otp-c312d2eb264d0f97e82f6fc5f8adfc35f2d9d5e7.zip | |
Merge branch 'leoliu/master' into maint
* leoliu/master:
Two minor fixes
OTP-12545
| -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 bf00958eb1..10565f67e5 100644 --- a/erts/emulator/beam/external.h +++ b/erts/emulator/beam/external.h @@ -156,7 +156,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 |