summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-01-18 16:03:57 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-01-18 16:03:57 +0000
commitf6c57b3509365e7e7194f1eddbeb13e8ce1e6e12 (patch)
treee66818bc431ae80ca2e42809d819cc88e84f4663
parent9f5b3c1d648d727236c4548a83f51a16faabc8d7 (diff)
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.
-rw-r--r--gobject/ChangeLog6
-rw-r--r--gobject/gobject.h3
2 files changed, 9 insertions, 0 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index f87796875..1ef9d7239 100644
--- 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 0e9b6a8be..21538dfc2 100644
--- 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