diff options
| author | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-10-15 18:02:38 +0200 |
| commit | 21270f86ab03d976ce3137c84d21e43ce6bc404b (patch) | |
| tree | 98843d726d270f8f65fa4371761829117d01239a /erts/emulator/sys/win32/sys.c | |
| parent | fb43535f0dd910b9013bc0bddcdb0c27f0df53f0 (diff) | |
| parent | 356c1e9312a640ac211b6d5d4110372742acfcde (diff) | |
| download | otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.gz otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.tar.bz2 otp-21270f86ab03d976ce3137c84d21e43ce6bc404b.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/emulator/sys/win32/sys.c')
| -rwxr-xr-x | erts/emulator/sys/win32/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c index f6bd2b1b0f..5ea4703a7a 100755 --- a/erts/emulator/sys/win32/sys.c +++ b/erts/emulator/sys/win32/sys.c @@ -3066,7 +3066,7 @@ erl_bin_write(buf, sz, max) } void -erl_assert_error(char* expr, char* file, int line) +erl_assert_error(const char* expr, const char* func, const char* file, int line) { char message[1024]; |