summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2010-09-09 11:03:22 +0300
committerTor Lillqvist <tml@iki.fi>2010-09-09 11:06:26 +0300
commitdd36afc2078dc0072b3dd4d17841b271b4ed770c (patch)
tree9742ad5f2abb7270dcceb85dd6a023913858f0f2 /gtk/gtkmain.h
parent91d0728dfaa3fd5d67c4f072601ecba44b5fd473 (diff)
downloadgtk+-dd36afc2078dc0072b3dd4d17841b271b4ed770c.tar.gz
Don't use the same name for a function that used to be a variable
Rename the gtk_major_version() etc functions I introduced yesterday to start with gtk_get. Avoids misleading results in client programs whose developers that don't notice the change or the compiler warnings, and when recompiling against gtk3 then use the function addresses as the version numbers.
Diffstat (limited to 'gtk/gtkmain.h')
-rw-r--r--gtk/gtkmain.h16
1 files changed, 11 insertions, 5 deletions
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h
index ca7bd669d7..39171f5848 100644
--- a/gtk/gtkmain.h
+++ b/gtk/gtkmain.h
@@ -51,11 +51,17 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget,
/* Gtk version.
*/
-guint gtk_major_version (void) G_GNUC_CONST;
-guint gtk_minor_version (void) G_GNUC_CONST;
-guint gtk_micro_version (void) G_GNUC_CONST;
-guint gtk_binary_age (void) G_GNUC_CONST;
-guint gtk_interface_age (void) G_GNUC_CONST;
+guint gtk_get_major_version (void) G_GNUC_CONST;
+guint gtk_get_minor_version (void) G_GNUC_CONST;
+guint gtk_get_micro_version (void) G_GNUC_CONST;
+guint gtk_get_binary_age (void) G_GNUC_CONST;
+guint gtk_get_interface_age (void) G_GNUC_CONST;
+
+#define gtk_major_version gtk_get_major_version ()
+#define gtk_minor_version gtk_get_minor_version ()
+#define gtk_micro_version gtk_get_micro_version ()
+#define gtk_binary_age gtk_get_binary_age ()
+#define gtk_interface_age gtk_get_interface_age ()
const gchar* gtk_check_version (guint required_major,
guint required_minor,