diff options
| author | Rickard Green <[email protected]> | 2015-03-26 12:07:00 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-26 12:07:00 +0100 |
| commit | 2e016f6cde89bf471269c89f0fd2bb40422ce204 (patch) | |
| tree | e505e8dc133cb6628d5581992c875cd07117d70e /erts/emulator/beam | |
| parent | 047811828ebac3c4909b8056b8268205c34b693c (diff) | |
| download | otp-2e016f6cde89bf471269c89f0fd2bb40422ce204.tar.gz otp-2e016f6cde89bf471269c89f0fd2bb40422ce204.tar.bz2 otp-2e016f6cde89bf471269c89f0fd2bb40422ce204.zip | |
Misc fixes
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_time_sup.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index 8203436c85..bbdedcc128 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -1693,7 +1693,7 @@ static void send_time_offset_changed_notifications(void *new_offsetp) { ErtsMonotonicTime new_offset; - ErtsTimeOffsetMonitorInfo *to_mon_info; + ErtsTimeOffsetMonitorInfo *to_mon_info = NULL; /* Shut up faulty warning */ Uint no_monitors; char *tmp = NULL; diff --git a/erts/emulator/beam/time.c b/erts/emulator/beam/time.c index 3dfd3f79d4..2bdda6c8af 100644 --- a/erts/emulator/beam/time.c +++ b/erts/emulator/beam/time.c @@ -576,7 +576,7 @@ erts_cancel_timer(ErlTimer *p) { ErtsTimerWheel *tiw; ErlCancelProc cancel; - void *arg; + void *arg = NULL; /* Shut up faulty warning... */ tiw = get_timer_wheel(p); if (!tiw) |