From ca2145bef250927a9fc05049890c8ffe248bd948 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 2 Oct 2014 11:27:16 +0200 Subject: [PATCH] core: minor fix in nm_utils_kill_child_sync() having side-effects in MIN() macro (again) Signed-off-by: Thomas Haller --- src/NetworkManagerUtils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index ed44839087..f4c3df9f5e 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -539,8 +539,8 @@ nm_utils_kill_child_sync (pid_t pid, int sig, guint64 log_domain, const char *lo if (loop_count < 20) { /* At the beginning we expect the process to die fast. * Limit the sleep time, the limit doubles with every iteration. */ - loop_count++; sleep_time = MIN (sleep_time, (((guint64) 1) << loop_count) * G_USEC_PER_SEC / 2000); + loop_count++; } g_usleep (sleep_time); }