diff options
| author | Tor Lillqvist <tml@iki.fi> | 2010-09-08 17:36:10 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2010-09-08 21:31:33 +0300 |
| commit | cb24bcc61301c2099289e684edb93becb2a01c39 (patch) | |
| tree | 6faf475927850f03a77e3b962e0a3e0f5d9e44d4 /gtk/gtkmain.h | |
| parent | b654afcb480c4f971436bd82a7b20f86686a9c02 (diff) | |
| download | gtk+-cb24bcc61301c2099289e684edb93becb2a01c39.tar.gz | |
Turn the gtk version and age variables into functions
Having variables exported from a DLL is slightly painful and
potentially error-prone on Windows, so let's try get rid of them now
when we can. Starting with these.
Diffstat (limited to 'gtk/gtkmain.h')
| -rw-r--r-- | gtk/gtkmain.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index fe4ff99490..ca7bd669d7 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -51,21 +51,12 @@ typedef gint (*GtkKeySnoopFunc) (GtkWidget *grab_widget, /* Gtk version. */ -#ifdef G_PLATFORM_WIN32 -#ifdef GTK_COMPILATION -#define GTKMAIN_C_VAR __declspec(dllexport) -#else -#define GTKMAIN_C_VAR extern __declspec(dllimport) -#endif -#else -#define GTKMAIN_C_VAR extern -#endif +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; -GTKMAIN_C_VAR const guint gtk_major_version; -GTKMAIN_C_VAR const guint gtk_minor_version; -GTKMAIN_C_VAR const guint gtk_micro_version; -GTKMAIN_C_VAR const guint gtk_binary_age; -GTKMAIN_C_VAR const guint gtk_interface_age; const gchar* gtk_check_version (guint required_major, guint required_minor, guint required_micro); |