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.

diff --git a/ChangeLog b/ChangeLog
index 0f119b4b8167e9c41fc61b87a0518f46d8167f7d..e8e6149b6dd6992c8882c9304d30d030121b531b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0f119b4b8167e9c41fc61b87a0518f46d8167f7d..e8e6149b6dd6992c8882c9304d30d030121b531b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0f119b4b8167e9c41fc61b87a0518f46d8167f7d..e8e6149b6dd6992c8882c9304d30d030121b531b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+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

diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in
index 55309f13beae211a198d10ebfd65676470cc75df..87eab582a87e8ff064bac2c46cec4fa9df5d556d 100644 (file)
--- 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 6936d46e3c63cff2af0824261e91744522fb2eae..49da10782c1605afdb8545752b826dd9107935ca 100644 (file)
--- 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