diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-08 14:51:44 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-08 14:51:44 +0200 |
| commit | ef1e9027c9ec7aa55de13eb3cb8372fddc59d30b (patch) | |
| tree | b320f02402c7d3e03b53026f49b7fa226b3e24d7 /erts/preloaded | |
| parent | a06c324e16ed07016e258556fbff65a886bd2253 (diff) | |
| parent | e47490f83e561a45cee9e8f72f1e1f91f19c60b7 (diff) | |
| download | otp-ef1e9027c9ec7aa55de13eb3cb8372fddc59d30b.tar.gz otp-ef1e9027c9ec7aa55de13eb3cb8372fddc59d30b.tar.bz2 otp-ef1e9027c9ec7aa55de13eb3cb8372fddc59d30b.zip | |
Merge branch 'richcarl/md5-fixes'
* richcarl/md5-fixes:
Set module_info md5 for native modules properly
Add module_info entry for native code
Gracefully handle empty md5 field in module_info
Remove 'imports' key from spec of get_module_info()
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index fd11c101bc..629702fc1c 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -1931,7 +1931,7 @@ element(_N, _Tuple) -> %% Not documented -spec erlang:get_module_info(Module, Item) -> ModuleInfo when Module :: atom(), - Item :: module | imports | exports | functions | attributes | compile | native_addresses | md5, + Item :: module | exports | functions | attributes | compile | native_addresses | md5, ModuleInfo :: atom() | [] | [{atom(), arity()}] | [{atom(), term()}] | [{atom(), arity(), integer()}]. get_module_info(_Module, _Item) -> erlang:nif_error(undefined). |