gparam.h gvalue.h gparam.c Shut up Sun's picky compiler.

2000-07-19  Tor Lillqvist  <tml@iki.fi>

* gparam.h
* gvalue.h
* gparam.c
* gtype.c: Shut up Sun's picky compiler.

5 files changed, 14 insertions, 7 deletions

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index a4ab2c5ae..2c69fbfc0 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+	* gparam.h
+	* gvalue.h
+	* gparam.c
+	* gtype.c: Shut up Sun's picky compiler.
+
 2000-07-14  Tor Lillqvist  <tml@iki.fi>
 
 	* gobject.def: Add g_type_get_plugin.
diff --git a/gobject/gparam.c b/gobject/gparam.c
index b35c407a5..e74787851 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -185,7 +185,7 @@ g_param_spec_set_qdata_full (GParamSpec    *pspec,
   g_return_if_fail (G_IS_PARAM_SPEC (pspec));
   g_return_if_fail (quark > 0);
 
-  g_datalist_id_set_data_full (&pspec->qdata, quark, data, data ? destroy : NULL);
+  g_datalist_id_set_data_full (&pspec->qdata, quark, data, data ? destroy : (GDestroyNotify) NULL);
 }
 
 gpointer
@@ -331,10 +331,10 @@ g_param_spec_hash_table_remove (GHashTable *hash_table,
   g_return_if_fail (hash_table != NULL);
   g_return_if_fail (G_IS_PARAM_SPEC (pspec));
 
-  g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) != NULL); // FIXME: paranoid
+  g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) != NULL); /* FIXME: paranoid */
 
   g_hash_table_remove (hash_table, pspec);
-  g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) == NULL); // FIXME: paranoid
+  g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) == NULL); /* FIXME: paranoid */
   pspec->owner_type = 0;
 }
 
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 3551b15ff..370fb4ff9 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -37,7 +37,7 @@ extern "C" {
 #define G_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
 #define G_IS_PARAM_SPEC(pspec)		(G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
 #define G_PARAM_SPEC_GET_CLASS(pspec)	(G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
-#define	G_IS_PARAM_VALUE(pspec, value)	(g_type_is_a (G_VALUE_TYPE (value), G_PARAM_SPEC_VALUE_TYPE (pspec))) // FIXME
+#define	G_IS_PARAM_VALUE(pspec, value)	(g_type_is_a (G_VALUE_TYPE (value), G_PARAM_SPEC_VALUE_TYPE (pspec))) /* FIXME */
 #define	G_PARAM_SPEC_VALUE_TYPE(pspec)	(G_PARAM_SPEC_GET_CLASS (pspec)->value_type)
 
 
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 72102253c..615e738b7 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -778,7 +778,7 @@ type_data_make (TypeNode              *node,
     *vtable = *value_table;
   node->data->common.value_table = vtable;
 
-  g_assert (node->data->common.value_table != NULL); // FIXME: paranoid
+  g_assert (node->data->common.value_table != NULL); /* FIXME: paranoid */
 }
 
 static inline void
@@ -1983,7 +1983,7 @@ g_type_init (void)
   memset (&info, 0, sizeof (info));
   node = type_node_fundamental_new (G_TYPE_INTERFACE, "GInterface", G_TYPE_FLAG_DERIVABLE);
   type = NODE_TYPE (node);
-  type_data_make (node, &info, NULL); // FIXME
+  type_data_make (node, &info, NULL); /* FIXME */
   g_assert (type == G_TYPE_INTERFACE);
 
   /* G_TYPE_* value types
diff --git a/gobject/gvalue.h b/gobject/gvalue.h
index bf58cd407..fb41ffa42 100644
--- a/gobject/gvalue.h
+++ b/gobject/gvalue.h
@@ -31,7 +31,7 @@ extern "C" {
 
 /* --- type macros --- */
 #define	G_TYPE_IS_VALUE(type)		(g_type_value_table_peek (type) != NULL)
-#define	G_IS_VALUE(value)		(G_TYPE_IS_VALUE (G_VALUE_TYPE (value))) // FIXME
+#define	G_IS_VALUE(value)		(G_TYPE_IS_VALUE (G_VALUE_TYPE (value))) /* FIXME */
 #define	G_VALUE_TYPE(value)		(G_TYPE_FROM_CLASS (value))
 #define	G_VALUE_TYPE_NAME(value)	(g_type_name (G_VALUE_TYPE (value)))