No need for INCLUDE_INTERNAL_SYMBOLS anymore.

2004-08-17  Matthias Clasen  <mclasen@redhat.com>

	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.

	* gdk/gdk.symbols: Don't use #if defined().

	* gdk/Makefile.am (gdkalias.h):
	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.

	* gdk/makegdkalias.pl:
	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
	keep the #ifdefs which differentiate between platforms.

	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no
	longer needed.

16 files changed, 262 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 009da40906..a306d32efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
+
+	* gdk/gdk.symbols: Don't use #if defined().
+
+	* gdk/Makefile.am (gdkalias.h): 
+	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.
+
+	* gdk/makegdkalias.pl: 
+	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
+	keep the #ifdefs which differentiate between platforms.
+
+	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no 
+	longer needed.
+
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
 	* tests/testfilechooserbutton.c: Use g_message() throughout, add RTL envar for
 	rtl testing.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 009da40906..a306d32efa 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,21 @@
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
+
+	* gdk/gdk.symbols: Don't use #if defined().
+
+	* gdk/Makefile.am (gdkalias.h): 
+	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.
+
+	* gdk/makegdkalias.pl: 
+	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
+	keep the #ifdefs which differentiate between platforms.
+
+	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no 
+	longer needed.
+
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
 	* tests/testfilechooserbutton.c: Use g_message() throughout, add RTL envar for
 	rtl testing.
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 009da40906..a306d32efa 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,21 @@
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
+
+	* gdk/gdk.symbols: Don't use #if defined().
+
+	* gdk/Makefile.am (gdkalias.h): 
+	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.
+
+	* gdk/makegdkalias.pl: 
+	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
+	keep the #ifdefs which differentiate between platforms.
+
+	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no 
+	longer needed.
+
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
 	* tests/testfilechooserbutton.c: Use g_message() throughout, add RTL envar for
 	rtl testing.
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 009da40906..a306d32efa 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,21 @@
 2004-08-17  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS anymore.
+
+	* gdk/gdk.symbols: Don't use #if defined().
+
+	* gdk/Makefile.am (gdkalias.h): 
+	* gtk/Makefile.am (gtkalias.h): Don't use cpp to filter gtk.symbols.
+
+	* gdk/makegdkalias.pl: 
+	* gtk/makegtkalias.pl: Move the #ifdef processing into the perl script, and
+	keep the #ifdefs which differentiate between platforms.
+
+	* gtk/Makefile.am (gtk_private_h_sources): Remove gtkinternals.h, it is no 
+	longer needed.
+
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
 	* tests/testfilechooserbutton.c: Use g_message() throughout, add RTL envar for
 	rtl testing.
 
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 8ce859d84d..9bf55a29d8 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,16 @@
+2004-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* abicheck.sh: No need for INCLUDE_INTERNAL_SYMBOLS any more.
+
+	* Makefile.am (gdk-pixbuf-alias.h): Don't use cpp to filter the symbols.
+
+	* makegdkpixbufalias.pl: Move the #ifdef processing into the perl script,
+	and keep the #ifdefs which differentiate between platforms.
+
+	* gdk-pixbuf.symbols: Remove the marshalers.
+
+	* Makefile.am (stamp-gdk-pixbuf-marshal.h): _-prefix the marshalers.
+
 Thu Aug 12 22:19:12 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* io-bmp.c (DecodeHeader): Properly determine the number of 
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 21dfe16f1a..9c370f6328 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -43,7 +43,7 @@ gdk_pixbuf.def: gdk-pixbuf.symbols
 	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
-	 cpp -P -DINCLUDE_INTERNAL_SYMBOLS gdk-pixbuf.symbols | ./makegdkpixbufalias.pl > gdk-pixbuf-alias.h
+	 ./makegdkpixbufalias.pl < gdk-pixbuf.symbols > gdk-pixbuf-alias.h
 
 if OS_UNIX
 TESTS = abicheck.sh
@@ -392,7 +392,7 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
 	@true
 
 stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+	$(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
 	&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
 	&& rm -f xgen-gmh xgen-gmh~ \
 	&& echo timestamp > $(@F)
diff --git a/gdk-pixbuf/abicheck.sh b/gdk-pixbuf/abicheck.sh
index 44df9df39d..041677276f 100755
--- a/gdk-pixbuf/abicheck.sh
+++ b/gdk-pixbuf/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DINCLUDE_INTERNAL_SYMBOLS gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P gdk-pixbuf.symbols | sed -e '/^$/d' | sort > expected-abi
 nm -D .libs/libgdk_pixbuf-2.0.so | grep " T " | cut -c12- | sort > actual-abi
 diff -u expected-abi actual-abi
diff --git a/gdk-pixbuf/gdk-pixbuf.symbols b/gdk-pixbuf/gdk-pixbuf.symbols
index 1001163558..f42c960239 100644
--- a/gdk-pixbuf/gdk-pixbuf.symbols
+++ b/gdk-pixbuf/gdk-pixbuf.symbols
@@ -57,10 +57,6 @@ gdk_pixbuf_loader_new_with_mime_type
 gdk_pixbuf_loader_new_with_type
 gdk_pixbuf_loader_set_size
 gdk_pixbuf_loader_write
-#ifdef INCLUDE_INTERNAL_SYMBOLS
-gdk_pixbuf_marshal_VOID__INT_INT
-gdk_pixbuf_marshal_VOID__INT_INT_INT_INT
-#endif
 gdk_pixbuf_new
 gdk_pixbuf_new_from_data
 gdk_pixbuf_new_from_file
diff --git a/gdk-pixbuf/makegdkpixbufalias.pl b/gdk-pixbuf/makegdkpixbufalias.pl
index a76b61599e..9bca4f7b4b 100755
--- a/gdk-pixbuf/makegdkpixbufalias.pl
+++ b/gdk-pixbuf/makegdkpixbufalias.pl
@@ -19,7 +19,6 @@ print <<EOF;
 
 #include "gdk-pixbuf.h"
 #include "gdk-pixdata.h"
-#include "gdk-pixbuf-marshal.h"
 
 EOF
 
@@ -28,14 +27,63 @@ while (<>) {
   # ignore empty lines
   next if /^\s*$/;
 
+  # skip comments
+  if ($_ =~ /^\s*\/\*/)
+  {
+      $in_comment = 1;
+  }
+  
+  if ($in_comment)
+  {
+      if ($_ =~  /\*\/\s$/)
+      {
+	  $in_comment = 0;
+      }
+      
+      next;
+  }
+
+  # handle ifdefs
+  if ($_ =~ /^\#endif/)
+  {
+      if (!$in_skipped_section)
+      {
+	  print $_;
+      }
+
+      $in_skipped_section = 0;
+
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  {
+      $in_skipped_section = 1;
+  }
+
+  if ($in_skipped_section)
+  {
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+G/)
+  {
+      print $_;
+      
+      next;
+  }
+
+
   my $str = $_;
   chomp($str);
   my $alias = $str."__internal_alias";
   
-  print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";
-  print "extern __typeof ($str) $str __attribute((alias(\"$alias\"), visibility(\"default\"))); \n";
-  print "#define $str $alias \n";
-  print "\n";
+  print <<EOF
+extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+\#define $str $alias
+
+EOF
 }
 
 print <<EOF;
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index fbf7ba481a..c8578a00fc 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -180,7 +180,7 @@ gdk.def: gdk.symbols
 	(echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES gdk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gdk.def
 
 gdkalias.h: gdk.symbols
-	 cpp -P gdk.symbols -DGDK_WINDOWING_X11 | ./makegdkalias.pl > gdkalias.h
+	 ./makegdkalias.pl <gdk.symbols > gdkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 16103aed83..8669507c3e 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -285,7 +285,10 @@ gdk_line_style_get_type
 gdk_list_visuals
 gdk_mbstowcs
 gdk_modifier_type_get_type
-#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
+#ifdef GDK_WINDOWING_X11
+gdk_net_wm_supports
+#endif
+#ifdef GDK_WINDOWING_WIN32
 gdk_net_wm_supports
 #endif
 gdk_notify_startup_complete
diff --git a/gdk/makegdkalias.pl b/gdk/makegdkalias.pl
index f46d21cc16..4a1185f468 100755
--- a/gdk/makegdkalias.pl
+++ b/gdk/makegdkalias.pl
@@ -29,23 +29,79 @@ print <<EOF;
 
 #include "gdk.h"
 
+#ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
+#endif
+#ifdef GDK_WINDOWING_WIN32
+#include "win32/gdkwin32.h"
+#endif
 
 EOF
 
+my $in_comment = 0;
+my $in_skipped_section = 0;
+
 while (<>) {
 
   # ignore empty lines
   next if /^\s*$/;
 
+  # skip comments
+  if ($_ =~ /^\s*\/\*/)
+  {
+      $in_comment = 1;
+  }
+  
+  if ($in_comment)
+  {
+      if ($_ =~  /\*\/\s$/)
+      {
+	  $in_comment = 0;
+      }
+      
+      next;
+  }
+
+  # handle ifdefs
+  if ($_ =~ /^\#endif/)
+  {
+      if (!$in_skipped_section)
+      {
+	  print $_;
+      }
+
+      $in_skipped_section = 0;
+
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  {
+      $in_skipped_section = 1;
+  }
+
+  if ($in_skipped_section)
+  {
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+G/)
+  {
+      print $_;
+      
+      next;
+  }
+
   my $str = $_;
   chomp($str);
   my $alias = $str."__internal_alias";
-  
-  print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";
-  print "extern __typeof ($str) $str __attribute((alias(\"$alias\"), visibility(\"default\"))); \n";
-  print "#define $str $alias \n";
-  print "\n";
+ 
+  print <<EOF
+extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+\#define $str $alias
+
+EOF
 }
 
 print <<EOF;
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2feac995f1..eb2659bba7 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -74,7 +74,7 @@ gtk.def: gtk.symbols
 	(echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def
 
 gtkalias.h: gtk.symbols
-	 cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | ./makegtkalias.pl > gtkalias.h
+	  ./makegtkalias.pl < gtk.symbols > gtkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh
@@ -295,7 +295,6 @@ gtk_private_h_sources =		\
 	gtkfilechooserutils.h	\
 	gtkfilesystemunix.h	\
 	gtkfilesystemmodel.h	\
-	gtkinternals.h		\
 	gtkpathbar.h		\
 	gtkrbtree.h		\
 	gtksequence.h		\
diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index 45198b627e..26b81edd91 100755
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DINCLUDE_INTERNAL_SYMBOLS gtk.symbols | sed -e '/^$/d' | sort > expected-abi
+cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 gtk.symbols | sed -e '/^$/d' | sort > expected-abi
 nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -c12- | sort > actual-abi
 diff -u expected-abi actual-abi
diff --git a/gtk/gtkinternals.h b/gtk/gtkinternals.h
deleted file mode 100644
index b3e1c2aeb0..0000000000
--- a/gtk/gtkinternals.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_INTERNALS_H__
-#define __GTK_INTERNALS_H__
-
-/* Uninstalled header defining types and functions internal to GDK */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-G_END_DECLS
-
-#endif /* __GTK_INTERNALS_H__ */
diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index 170832fc40..9fb298b578 100755
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -30,9 +30,13 @@ print <<EOF;
 #include "gtk.h"
 
 #include "gtkfilesystem.h"
+#ifdef G_OS_UNIX
 #include "gtkfilesystemunix.h"
+#endif
+#ifdef G_OS_WIN32
+#include "gtkfilesystemwin32.h"
+#endif
 #include "gtkhsv.h"
-#include "gtkinternals.h"
 #include "gtkpathbar.h"
 #include "gtktextdisplay.h"
 #include "gtktextlayout.h"
@@ -43,19 +47,71 @@ print <<EOF;
 
 EOF
 
+my $in_comment = 0;
+my $in_skipped_section = 0;
+
 while (<>) {
 
   # ignore empty lines
   next if /^\s*$/;
 
+  # skip comments
+  if ($_ =~ /^\s*\/\*/)
+  {
+      $in_comment = 1;
+  }
+  
+  if ($in_comment)
+  {
+      if ($_ =~  /\*\/\s$/)
+      {
+	  $in_comment = 0;
+      }
+      
+      next;
+  }
+
+  # handle ifdefs
+  if ($_ =~ /^\#endif/)
+  {
+      if (!$in_skipped_section)
+      {
+	  print $_;
+      }
+
+      $in_skipped_section = 0;
+
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+INCLUDE_VARIABLES/)
+  {
+      $in_skipped_section = 1;
+  }
+
+  if ($in_skipped_section)
+  {
+      next;
+  }
+
+  if ($_ =~ /^\#ifdef\s+G/)
+  {
+      print $_;
+      
+      next;
+  }
+ 
+
   my $str = $_;
   chomp($str);
   my $alias = $str."__internal_alias";
   
-  print "extern __typeof ($str) $alias __attribute((visibility(\"hidden\"))); \n";
-  print "extern __typeof ($str) $str __attribute((alias(\"$alias\"), visibility(\"default\"))); \n";
-  print "#define $str $alias \n";
-  print "\n";
+  print <<EOF
+extern __typeof ($str) $alias __attribute((visibility("hidden")));
+extern __typeof ($str) $str __attribute((alias("$alias"), visibility("default")));
+\#define $str $alias
+
+EOF
 }
 
 print <<EOF;