diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2013-07-15 17:30:33 +0200 |
| commit | c6f452c340ad1749ce91c037a4820ea0feb0a644 (patch) | |
| tree | 771d4ce8009e17c42c02b0f3504f3d845e51ce8c /erts/emulator/beam/utils.c | |
| parent | 625748f78566ba8638f494fc09be4311672e473b (diff) | |
| parent | c250cec28d4cd5dbe68abd8835730eaf81aba086 (diff) | |
| download | otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.gz otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.tar.bz2 otp-c6f452c340ad1749ce91c037a4820ea0feb0a644.zip | |
Merge branch 'egil/erts/aggregate-system-traceability/OTP-11196' into maint
* egil/erts/aggregate-system-traceability/OTP-11196:
Check for native code without loading module
Fix erlang:system_info(compile_info)
Fix system_information get_beam_name/0
Add beam dynamic libraries to system_information
Add system_information testsuite
Add system information aggregate
Refactor away ?line macro in code_SUITE
Fix tests for erts app-file
Add erts app-file
erts: Add cflags, ldflags and config.h into executable
Diffstat (limited to 'erts/emulator/beam/utils.c')
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index 84deaecb87..bd2be7afca 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -2983,7 +2983,7 @@ char* Sint_to_buf(Sint n, struct Sint_buf *buf) */ Eterm -buf_to_intlist(Eterm** hpp, char *buf, size_t len, Eterm tail) +buf_to_intlist(Eterm** hpp, const char *buf, size_t len, Eterm tail) { Eterm* hp = *hpp; size_t i = len; |