diff options
author | Lukas Larsson <[email protected]> | 2018-05-15 10:26:02 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2018-05-15 10:26:02 +0200 |
commit | 3b3e2f46841e3e86c991be92d62cbb0360ca80e3 (patch) | |
tree | 5fc8a58640a937ca13f0bf8780fd91f87705a8f3 /erts/emulator/nifs/unix | |
parent | 0c737f730eccd5716b6d87b0ef690fc7ad02d547 (diff) | |
parent | fa4fcc2bb54b6e60a9b9379707a5d30403b011ac (diff) | |
download | otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.tar.gz otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.tar.bz2 otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.zip |
Merge branch 'lukas/erts/otp-21-misc'
* lukas/erts/otp-21-misc:
erts: Fix unused variable warning in unix prim file
erts: Fix erts_os_times warning
kernel: Fix comment in kernel_config
kernel: Refactor erl_signal_handler startup
kernel: Remove doc for unused browser_cmd variable
Diffstat (limited to 'erts/emulator/nifs/unix')
-rw-r--r-- | erts/emulator/nifs/unix/unix_prim_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/nifs/unix/unix_prim_file.c b/erts/emulator/nifs/unix/unix_prim_file.c index 1637f9cb71..2b112dda76 100644 --- a/erts/emulator/nifs/unix/unix_prim_file.c +++ b/erts/emulator/nifs/unix/unix_prim_file.c @@ -512,8 +512,8 @@ int efile_sync(efile_data_t *d, int data_only) { } int efile_advise(efile_data_t *d, Sint64 offset, Sint64 length, enum efile_advise_t advise) { - efile_unix_t *u = (efile_unix_t*)d; #ifdef HAVE_POSIX_FADVISE + efile_unix_t *u = (efile_unix_t*)d; int p_advise; switch(advise) { |