Several minor ANSI C fixes.

2000-09-29  Martin Baulig  <baulig@suse.de>

	Several minor ANSI C fixes.

	Added missing casts:
	* gtype.c (type_class_init): `(gpointer) bnode->data->class.class_init_base'
	in call to g_slist_prepend() and
	'GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data'.

	* gobject.c: Put text following #endif into comments.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 7a39208..98e5f31 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-29  Martin Baulig  <baulig@suse.de>
+       
+       Several minor ANSI C fixes.
+
+       Added missing casts:
+       * gtype.c (type_class_init): `(gpointer) bnode->data->class.class_init_base'
+       in call to g_slist_prepend() and
+       'GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data'.
+
+       * gobject.c: Put text following #endif into comments.
+
 2000-09-25  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * Makefile.am: Remove empty SUBDIRS line, as that prevents make

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 7f47335..e772769 100644 (file)
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -97,7 +97,7 @@ debug_objects_atexit (void)
        }
     }
 }
-#endif DEBUG_OBJECTS
+#endif /* DEBUG_OBJECTS */
 
 void
 g_object_type_init (void)      /* sync with gtype.c */
@@ -140,7 +140,7 @@ g_object_type_init (void)   /* sync with gtype.c */
   
 #ifdef DEBUG_OBJECTS
   g_atexit (debug_objects_atexit);
-#endif DEBUG_OBJECTS
+#endif /* DEBUG_OBJECTS */
 }
 
 static void
@@ -256,7 +256,7 @@ g_object_do_init (GObject *object)
       debug_objects_count++;
       g_hash_table_insert (debug_objects_ht, object, object);
     }
-#endif DEBUG_OBJECTS
+#endif /* DEBUG_OBJECTS */
 }
 
 static void
@@ -298,7 +298,7 @@ g_object_do_finalize (GObject *object)
       g_hash_table_remove (debug_objects_ht, object);
       debug_objects_count--;
     }
-#endif DEBUG_OBJECTS
+#endif /* DEBUG_OBJECTS */
 }
 
 gpointer

diff --git a/gobject/gtype.c b/gobject/gtype.c
index e6ade67..a4818cc 100644 (file)
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1098,10 +1098,10 @@ type_class_init (TypeNode   *node,
    */
   for (bnode = node; bnode; bnode = LOOKUP_TYPE_NODE (NODE_PARENT_TYPE (bnode)))
     if (bnode->data->class.class_init_base)
-      init_slist = g_slist_prepend (init_slist, bnode->data->class.class_init_base);
+      init_slist = g_slist_prepend (init_slist, (gpointer) bnode->data->class.class_init_base);
   for (slist = init_slist; slist; slist = slist->next)
     {
-      GBaseInitFunc class_init_base = slist->data;
+      GBaseInitFunc class_init_base = (GBaseInitFunc) slist->data;
       
       class_init_base (class);
     }