From 2d7fa2dd185dac8a8fe1c072b83ed6dae8a5da80 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 19 Dec 2006 02:49:39 +0000 Subject: [PATCH] Readd a return which was removed as dead code a while ago. icc may * glib/gmain.c (child_watch_helper_thread): Readd a return which was removed as dead code a while ago. icc may consider it dead, but gcc doesn't like non-void functions without a return... (#354707) --- ChangeLog | 5 +++++ glib/gmain.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index b913452..9ac4eaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-12-18 Matthias Clasen + * glib/gmain.c (child_watch_helper_thread): Readd a + return which was removed as dead code a while ago. + icc may consider it dead, but gcc doesn't like non-void + functions without a return... (#354707) + * tests/Makefile.am: Try a different fix for bug 346373. 2006-12-18 Matthias Clasen diff --git a/glib/gmain.c b/glib/gmain.c index 432ddff..0bbd30f 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -3865,6 +3865,8 @@ child_watch_helper_thread (gpointer data) } G_UNLOCK (main_context_list); } + + return NULL; } static void -- 2.7.4