diff options
| author | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2013-06-05 15:58:37 +0200 |
| commit | e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816 (patch) | |
| tree | 85311be5c695d5aea5602bb5ba6f8308b3e4b69e /erts/emulator/beam/global.h | |
| parent | a7f0387da9aa6cf469a02caf071e20120d3bad87 (diff) | |
| parent | c6fe4731a9093166ff41d16900d22808b5a68053 (diff) | |
| download | otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.gz otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.tar.bz2 otp-e9b0b2a035f3ca51c9e792a7b3c7c036b72e6816.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rwxr-xr-x | erts/emulator/beam/global.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 325e6658d9..bc4a7fc838 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -740,6 +740,8 @@ void erl_drv_thr_init(void); /* utils.c */ void erts_cleanup_offheap(ErlOffHeap *offheap); +Uint64 erts_timestamp_millis(void); + Export* erts_find_function(Eterm, Eterm, unsigned int, ErtsCodeIndex); Eterm store_external_or_ref_in_proc_(Process *, Eterm); |