Rename the GUTILS_C_VAR macro to GLIB_VAR.

[platform/upstream/glib.git] / gmain.c

diff --git a/gmain.c b/gmain.c
index a2ca73a..155ccbd 100644 (file)
--- a/gmain.c
+++ b/gmain.c
@@ -1186,6 +1186,10 @@ g_main_remove_poll (GPollFD *fd)
          else
            poll_records = pollrec->next;
 
+#ifdef ENABLE_GC_FRIENDLY
+         pollrec->fd = NULL;  
+#endif /* ENABLE_GC_FRIENDLY */
+
          pollrec->next = poll_free_list;
          poll_free_list = pollrec;
 
@@ -1348,7 +1352,8 @@ g_idle_prepare  (gpointer  source_data,
                 gint     *timeout,
                 gpointer  user_data)
 {
-  timeout = 0;
+  *timeout = 0;
+
   return TRUE;
 }