summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-03-01 14:57:20 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-03-01 14:57:20 +0000
commit6834bb95976e095a296213b25428986319bc82db (patch)
treef580afec6a2046d9516b4ae7be82d9dffa80e292
parent4fcaa4e1dafbcf39ce42a9c752f1083388908569 (diff)
downloadgtk+-6834bb95976e095a296213b25428986319bc82db.tar.gz
Revert the previous change, since it breaks bin compat.
2005-03-01 Matthias Clasen <mclasen@redhat.com> * gdk-pixbuf/gdk-pixbuf.c: * gdk-pixbuf/gdk-pixbuf-features.h.in: Revert the previous change, since it breaks bin compat.
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gdk-pixbuf/gdk-pixbuf-features.h.in2
-rw-r--r--gdk-pixbuf/gdk-pixbuf.c2
5 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f119b4b81..e8e6149b6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
+ * gdk-pixbuf/gdk-pixbuf.c:
+ * gdk-pixbuf/gdk-pixbuf-features.h.in:
+ Revert the previous change, since it breaks
+ bin compat.
+
+2005-03-01 Matthias Clasen <mclasen@redhat.com>
+
* gdk/gdkkeyuni.c
* gdk/gdkpixbuf-drawable.c
* gdk/gdkrgb.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0f119b4b81..e8e6149b6d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
+ * gdk-pixbuf/gdk-pixbuf.c:
+ * gdk-pixbuf/gdk-pixbuf-features.h.in:
+ Revert the previous change, since it breaks
+ bin compat.
+
+2005-03-01 Matthias Clasen <mclasen@redhat.com>
+
* gdk/gdkkeyuni.c
* gdk/gdkpixbuf-drawable.c
* gdk/gdkrgb.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0f119b4b81..e8e6149b6d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,12 @@
2005-03-01 Matthias Clasen <mclasen@redhat.com>
+ * gdk-pixbuf/gdk-pixbuf.c:
+ * gdk-pixbuf/gdk-pixbuf-features.h.in:
+ Revert the previous change, since it breaks
+ bin compat.
+
+2005-03-01 Matthias Clasen <mclasen@redhat.com>
+
* gdk/gdkkeyuni.c
* gdk/gdkpixbuf-drawable.c
* gdk/gdkrgb.c
diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
index 55309f13be..87eab582a8 100644
--- a/gdk-pixbuf/gdk-pixbuf-features.h.in
+++ b/gdk-pixbuf/gdk-pixbuf-features.h.in
@@ -36,6 +36,6 @@
GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version;
GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version;
GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version;
-GDK_PIXBUF_VAR const char gdk_pixbuf_version[];
+GDK_PIXBUF_VAR const char *gdk_pixbuf_version;
#endif
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 6936d46e3c..49da10782c 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -543,7 +543,7 @@ GDK_PIXBUF_VAR const guint gdk_pixbuf_major_version = GDK_PIXBUF_MAJOR;
GDK_PIXBUF_VAR const guint gdk_pixbuf_minor_version = GDK_PIXBUF_MINOR;
GDK_PIXBUF_VAR const guint gdk_pixbuf_micro_version = GDK_PIXBUF_MICRO;
-GDK_PIXBUF_VAR const char gdk_pixbuf_version[] = GDK_PIXBUF_VERSION;
+GDK_PIXBUF_VAR const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION;
/* Error quark */
GQuark