X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk-pixbuf%2Fmakegdkpixbufalias.pl;h=a03da363e970beaf7e6de2245c6a68dd463c8980;hb=94f6a09585696b08824d9542a686f0d5437b803e;hp=1c384bf3b8319ede5f9ae801ed50a887288d9cff;hpb=d04d99e9475c9cd7c44a4353abeb5286c309301e;p=~andy%2Fgtk

diff --git a/gdk-pixbuf/makegdkpixbufalias.pl b/gdk-pixbuf/makegdkpixbufalias.pl
index 1c384bf3b..a03da363e 100755
--- a/gdk-pixbuf/makegdkpixbufalias.pl
+++ b/gdk-pixbuf/makegdkpixbufalias.pl
@@ -1,26 +1,43 @@
 #!/usr/bin/perl -w
 
+my $do_def = 0;
+
+if (($#ARGV >= 0) && ($ARGV[0] eq "-def")) {
+    shift;
+    $do_def = 1;
+}
+
 print <<EOF;
 /* Generated by makegdkpixbufalias.pl */
 
+#ifndef DISABLE_VISIBILITY
+
 #include <glib.h>
 
 #ifdef G_HAVE_GNUC_VISIBILITY
 
-#ifdef  GDK_PIXBUF_DISABLE_DEPRECATED
-#define WAS_NO_DEPR
-#endif
-#undef  GDK_PIXBUF_DISABLE_DEPRECATED
+EOF
 
-#ifdef  G_DISABLE_DEPRECATED
-#define WAS_NO_G_DEPR
-#endif
-#undef  G_DISABLE_DEPRECATED
+if ($do_def) {
+    print <<EOF
+#undef IN_FILE
+#define IN_FILE defined
 
-#include "gdk-pixbuf.h"
-#include "gdk-pixdata.h"
+#undef IN_HEADER
+#define IN_HEADER(x) 1
 
 EOF
+} 
+else { 
+    print <<EOF
+#define IN_FILE(x) 1
+#define IN_HEADER defined
+
+EOF
+}
+
+my $in_comment = 0;
+my $in_skipped_section = 0;
 
 while (<>) {
 
@@ -56,7 +73,7 @@ while (<>) {
       next;
   }
 
-  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES|INCLUDE_INTERNAL_SYMBOLS|ALL_FILES/)
   {
       $in_skipped_section = 1;
   }
@@ -66,39 +83,55 @@ while (<>) {
       next;
   }
 
-  if ($_ =~ /^\#ifdef\s+G/)
+  if ($_ =~ /^\#ifn?def\s+G/)
   {
       print $_;
       
       next;
   }
 
+  if ($_ =~ /^\#if.*(IN_FILE|IN_HEADER|IN_FILE)/)
+  {
+      print $_;
+      
+      next;
+  }
 
+  chop;
   my $str = $_;
+  my @words;
+  my $attributes = "";
+
+  @words = split(/ /, $str);
+  $str = shift(@words);
   chomp($str);
   my $alias = "IA__".$str;
   
-  print <<EOF
-extern __typeof ($str) $alias __attribute((visibility("hidden")));
-extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+  # Drop any Win32 specific .def file syntax,  but keep attributes
+  foreach $word (@words) {
+      $attributes = "$attributes $word" unless $word eq "PRIVATE";
+  }
+  
+  if (!$do_def) {
+    print <<EOF
+extern __typeof ($str) $alias __attribute((visibility("hidden")))$attributes;
 \#define $str $alias
 
 EOF
+  }
+  else {
+    print <<EOF
+\#undef $str 
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+
+EOF
+  }
 }
 
 print <<EOF;
 
-#ifdef  WAS_NO_DEPR
-#define GDK_PIXBUF_DISABLE_DEPRECATED
-#undef  WAS_NO_DEPR
-#endif
-
-#ifdef  WAS_NO_G_DEPR
-#define G_DISABLE_DEPRECATED
-#undef  WAS_NO_G_DEPR
-#endif
-
 #endif /* G_HAVE_GNUC_VISIBILITY */
+#endif /* DISABLE_VISIBILITY */
 EOF