diff options
| author | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
| commit | 29ed0766068fbf960651c3f4d1f73281304dd546 (patch) | |
| tree | 70c9f75ba131f21c3fda6d3684eee070bc027668 /erts/emulator/beam | |
| parent | 26eba549b2adc29bab37a5edd7aa96b42399936e (diff) | |
| parent | 2e016f6cde89bf471269c89f0fd2bb40422ce204 (diff) | |
| download | otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.gz otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.bz2 otp-29ed0766068fbf960651c3f4d1f73281304dd546.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Misc fixes
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
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) |