Make g_object_compat_control() visible for GTK+ compilation, to avoid

2006-01-18  Matthias Clasen  <mclasen@redhat.com>

	* gobject.h: Make g_object_compat_control() visible
	for GTK+ compilation, to avoid segfaults on 64bit
	platforms.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index f87796875bba81b26e7aa63f6fd680d69db37e48..1ef9d7239ff1b9c56e0e594f3ad8fe877dd3b607 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gobject.h: Make g_object_compat_control() visible
+       for GTK+ compilation, to avoid segfaults on 64bit
+       platforms.
+
 2006-01-16  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.9.3 ===

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 0e9b6a8be90eea4d8f01518d64beed0b279153f1..21538dfc2d318c347574ca16575be9f625b896bf 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -254,6 +254,9 @@ void        g_value_take_object               (GValue         *value,
 #ifndef G_DISABLE_DEPRECATED
 void        g_value_set_object_take_ownership (GValue         *value,
                                               gpointer        v_object);
+#endif
+
+#if !defined(G_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
 gsize      g_object_compat_control           (gsize           what,
                                               gpointer        data);
 #endif