Don't mark gdk_pixbuf_error_quark() as const, to be consistent with all

2004-11-23  Matthias Clasen  <mclasen@redhat.com>

	* gdk-pixbuf-core.h: Don't mark gdk_pixbuf_error_quark() as const,
	to be consistent with all the other error_quark functions.
	(technically they are const, but since these are called only
	in error paths, giving the compiler better optimization
	opportunities doesn't matter much)

	* gdk-pixbuf.symbols: Add attribute annotations.
	* makegdkpixbufalias.pl: Keep attribute annotations, but strip PRIVATE.
	* Makefile.am (gdk_pixbuf.def): Strip attribute annotations, but keep
	PRIVATE.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 99a59e823326681677ec28c950a0ea4c87899088..dbaab56b8c135da3f697cfe83aec370e407c40ae 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf-core.h: Don't mark gdk_pixbuf_error_quark() as const,
+       to be consistent with all the other error_quark functions. 
+       (technically they are const, but since these are called only
+       in error paths, giving the compiler better optimization 
+       opportunities doesn't matter much)
+
+       * gdk-pixbuf.symbols: Add attribute annotations.
+       * makegdkpixbufalias.pl: Keep attribute annotations, but strip PRIVATE.
+       * Makefile.am (gdk_pixbuf.def): Strip attribute annotations, but keep 
+       PRIVATE.
+
 Mon Nov 15 18:58:22 2004  Manish Singh  <yosh@gimp.org>
 
        * gdk-pixbuf-private.h: _gdk_pixbuf_lock now returns a gboolean.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 0e69c749327ccf0aef4bc0803fdc10aff082b716..21f63913fd9af86a994ae0216355235e56224e7a 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -40,7 +40,7 @@ uninstall-ms-lib:
 endif
 
 gdk_pixbuf.def: gdk-pixbuf.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/    /') > gdk_pixbuf.def
+       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
         $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h

diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h
index a51be74081f192e07a0b44fd414a3ef9a8d8ae22..c9ad9c0e59db693569c03743e600b6767d500e02 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -73,7 +73,7 @@ typedef enum {
         GDK_PIXBUF_ERROR_FAILED
 } GdkPixbufError;
 
-GQuark gdk_pixbuf_error_quark (void) G_GNUC_CONST;
+GQuark gdk_pixbuf_error_quark (void);
 
 \f
 

diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols
index 2d14d2360fcb4ac17b914667e4cf381943d7e8c0..ca3ad33c6c08a31a2c9c5a24255a249476e372fb 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.symbols
+++ b/gdk-pixbuf/gdk-pixbuf.symbols
@@ -5,7 +5,7 @@ gdk_pixbuf_alpha_mode_get_type
 gdk_pixbuf_animation_get_height
 gdk_pixbuf_animation_get_iter
 gdk_pixbuf_animation_get_static_image
-gdk_pixbuf_animation_get_type
+gdk_pixbuf_animation_get_type G_GNUC_CONST
 gdk_pixbuf_animation_get_width
 gdk_pixbuf_animation_is_static_image
 gdk_pixbuf_animation_iter_advance
@@ -45,13 +45,13 @@ gdk_pixbuf_get_n_channels
 gdk_pixbuf_get_option
 gdk_pixbuf_get_pixels
 gdk_pixbuf_get_rowstride
-gdk_pixbuf_get_type
+gdk_pixbuf_get_type G_GNUC_CONST
 gdk_pixbuf_get_width
 gdk_pixbuf_loader_close
 gdk_pixbuf_loader_get_animation
 gdk_pixbuf_loader_get_format
 gdk_pixbuf_loader_get_pixbuf
-gdk_pixbuf_loader_get_type
+gdk_pixbuf_loader_get_type G_GNUC_CONST
 gdk_pixbuf_loader_new
 gdk_pixbuf_loader_new_with_mime_type
 gdk_pixbuf_loader_new_with_type

diff --git a/gdk-pixbuf/makegdkpixbufalias.pl b/gdk-pixbuf/makegdkpixbufalias.pl
index 6833e6cc94b40bbc29558963ca47c399c4659f57..4d1454ca8600df4955c238099ed90c9148cd8273 100755 (executable)
--- a/gdk-pixbuf/makegdkpixbufalias.pl
+++ b/gdk-pixbuf/makegdkpixbufalias.pl
@@ -75,13 +75,23 @@ while (<>) {
       next;
   }
 
-
+  chop;
   my $str = $_;
+  my @words;
+  my $attributes = "";
+
+  @words = split(/ /, $str);
+  $str = shift(@words);
   chomp($str);
   my $alias = "IA__".$str;
   
+  # Drop any Win32 specific .def file syntax,  but keep attributes
+  foreach $word (@words) {
+      $attributes = "$attributes $word" unless $word eq "PRIVATE";
+  }
+  
   print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $alias __attribute((visibility("hidden")))$attribute;
 extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
 \#define $str $alias