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)

diff --git a/ChangeLog b/ChangeLog
index b913452..9ac4eaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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  <mclasen@redhat.com>

diff --git a/glib/gmain.c b/glib/gmain.c
index 432ddff..0bbd30f 100644 (file)
--- 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