diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index dd73b5c09..ad579b622 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 18 09:46:56 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gobject.c gsignal.c: Change C++ comments for FIXME's to
+	C comments. (Patch from Andres Salomon)
+
 2001-04-14  Hans Breuer  <hans@breuer.org>
 
 	* gobject.def : updated
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 60432106a..845a95583 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1066,7 +1066,7 @@ g_signal_newv (const gchar       *signal_name,
     g_return_val_if_fail (accu_data == NULL, 0);
 
   name = g_strdup (signal_name);
-  g_strdelimit (name, G_STR_DELIMITERS ":^", '_');  // FIXME do character checks like for types
+  g_strdelimit (name, G_STR_DELIMITERS ":^", '_');  /* FIXME do character checks like for types */
   
   G_LOCK (g_signal_mutex);
   
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 87530595b..f1d3dac0f 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1354,7 +1354,7 @@ g_type_free_instance (GTypeInstance *instance)
     }
   
   instance->g_class = NULL;
-  memset (instance, 0xaa, node->data->instance.instance_size);	// FIXME: debugging hack
+  memset (instance, 0xaa, node->data->instance.instance_size);	/* FIXME: debugging hack */
   if (node->data->instance.n_preallocs)
     {
       G_WRITE_LOCK (&type_rw_lock);