From 376b8f42ac0ab7035a95cebf7a51cd1798c3c4a7 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Tue, 30 Aug 2005 20:12:43 +0000
Subject: [PATCH] 2005-08-30  Mike Kestner  <mkestner@novell.com>

	* parser/gapi_pp.pl : ignore ifndef *_H_ lines like in 1.0.x.
	[Fixes #75938]

svn path=/trunk/gtk-sharp/; revision=49151
---
 ChangeLog           |  5 +++++
 gtk/gtk-api-2.4.raw | 12 +++++++++---
 gtk/gtk-api-2.6.raw | 15 ++++++++++++---
 gtk/gtk-api-2.8.raw | 15 ++++++++++++---
 parser/gapi_pp.pl   |  2 ++
 5 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 993195f73..7c0d9d8b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-30  Mike Kestner  <mkestner@novell.com>
+
+	* parser/gapi_pp.pl : ignore ifndef *_H_ lines like in 1.0.x.
+	[Fixes #75938]
+
 2005-08-30  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/NodeStore.custom : recursively emit row_inserted for AddNode.
diff --git a/gtk/gtk-api-2.4.raw b/gtk/gtk-api-2.4.raw
index 7934ba3c3..b4a979195 100644
--- a/gtk/gtk-api-2.4.raw
+++ b/gtk/gtk-api-2.4.raw
@@ -94,6 +94,15 @@
       <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline" />
       <member cname="GTK_CURVE_TYPE_FREE" name="Free" />
     </enum>
+    <enum name="DebugFlag" cname="GtkDebugFlag" gtype="gtk_debug_flag_get_type" type="flags">
+      <member cname="GTK_DEBUG_MISC" name="Misc" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DEBUG_PLUGSOCKET" name="Plugsocket" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DEBUG_TEXT" name="Text" value="1 &lt;&lt; 2" />
+      <member cname="GTK_DEBUG_TREE" name="Tree" value="1 &lt;&lt; 3" />
+      <member cname="GTK_DEBUG_UPDATES" name="Updates" value="1 &lt;&lt; 4" />
+      <member cname="GTK_DEBUG_KEYBINDINGS" name="Keybindings" value="1 &lt;&lt; 5" />
+      <member cname="GTK_DEBUG_MULTIHEAD" name="Multihead" value="1 &lt;&lt; 6" />
+    </enum>
     <enum name="DeleteType" cname="GtkDeleteType" gtype="gtk_delete_type_get_type" type="enum">
       <member cname="GTK_DELETE_CHARS" name="Chars" />
       <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds" />
@@ -16138,9 +16147,6 @@
       <method name="ClistDragPosGetType" cname="gtk_clist_drag_pos_get_type" shared="true">
         <return-type type="GType" />
       </method>
-      <method name="DebugFlagGetType" cname="gtk_debug_flag_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
       <method name="DisableSetlocale" cname="gtk_disable_setlocale" shared="true">
         <return-type type="void" />
       </method>
diff --git a/gtk/gtk-api-2.6.raw b/gtk/gtk-api-2.6.raw
index 7e232577b..c32d4488d 100644
--- a/gtk/gtk-api-2.6.raw
+++ b/gtk/gtk-api-2.6.raw
@@ -94,6 +94,18 @@
       <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline" />
       <member cname="GTK_CURVE_TYPE_FREE" name="Free" />
     </enum>
+    <enum name="DebugFlag" cname="GtkDebugFlag" gtype="gtk_debug_flag_get_type" type="flags">
+      <member cname="GTK_DEBUG_MISC" name="Misc" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DEBUG_PLUGSOCKET" name="Plugsocket" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DEBUG_TEXT" name="Text" value="1 &lt;&lt; 2" />
+      <member cname="GTK_DEBUG_TREE" name="Tree" value="1 &lt;&lt; 3" />
+      <member cname="GTK_DEBUG_UPDATES" name="Updates" value="1 &lt;&lt; 4" />
+      <member cname="GTK_DEBUG_KEYBINDINGS" name="Keybindings" value="1 &lt;&lt; 5" />
+      <member cname="GTK_DEBUG_MULTIHEAD" name="Multihead" value="1 &lt;&lt; 6" />
+      <member cname="GTK_DEBUG_MODULES" name="Modules" value="1 &lt;&lt; 7" />
+      <member cname="GTK_DEBUG_GEOMETRY" name="Geometry" value="1 &lt;&lt; 8" />
+      <member cname="GTK_DEBUG_ICONTHEME" name="Icontheme" value="1 &lt;&lt; 9" />
+    </enum>
     <enum name="DeleteType" cname="GtkDeleteType" gtype="gtk_delete_type_get_type" type="enum">
       <member cname="GTK_DELETE_CHARS" name="Chars" />
       <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds" />
@@ -17175,9 +17187,6 @@
       <method name="ClistDragPosGetType" cname="gtk_clist_drag_pos_get_type" shared="true">
         <return-type type="GType" />
       </method>
-      <method name="DebugFlagGetType" cname="gtk_debug_flag_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
       <method name="DisableSetlocale" cname="gtk_disable_setlocale" shared="true">
         <return-type type="void" />
       </method>
diff --git a/gtk/gtk-api-2.8.raw b/gtk/gtk-api-2.8.raw
index 934781de9..014298c35 100644
--- a/gtk/gtk-api-2.8.raw
+++ b/gtk/gtk-api-2.8.raw
@@ -94,6 +94,18 @@
       <member cname="GTK_CURVE_TYPE_SPLINE" name="Spline" />
       <member cname="GTK_CURVE_TYPE_FREE" name="Free" />
     </enum>
+    <enum name="DebugFlag" cname="GtkDebugFlag" gtype="gtk_debug_flag_get_type" type="flags">
+      <member cname="GTK_DEBUG_MISC" name="Misc" value="1 &lt;&lt; 0" />
+      <member cname="GTK_DEBUG_PLUGSOCKET" name="Plugsocket" value="1 &lt;&lt; 1" />
+      <member cname="GTK_DEBUG_TEXT" name="Text" value="1 &lt;&lt; 2" />
+      <member cname="GTK_DEBUG_TREE" name="Tree" value="1 &lt;&lt; 3" />
+      <member cname="GTK_DEBUG_UPDATES" name="Updates" value="1 &lt;&lt; 4" />
+      <member cname="GTK_DEBUG_KEYBINDINGS" name="Keybindings" value="1 &lt;&lt; 5" />
+      <member cname="GTK_DEBUG_MULTIHEAD" name="Multihead" value="1 &lt;&lt; 6" />
+      <member cname="GTK_DEBUG_MODULES" name="Modules" value="1 &lt;&lt; 7" />
+      <member cname="GTK_DEBUG_GEOMETRY" name="Geometry" value="1 &lt;&lt; 8" />
+      <member cname="GTK_DEBUG_ICONTHEME" name="Icontheme" value="1 &lt;&lt; 9" />
+    </enum>
     <enum name="DeleteType" cname="GtkDeleteType" gtype="gtk_delete_type_get_type" type="enum">
       <member cname="GTK_DELETE_CHARS" name="Chars" />
       <member cname="GTK_DELETE_WORD_ENDS" name="WordEnds" />
@@ -17482,9 +17494,6 @@
       <method name="ClistDragPosGetType" cname="gtk_clist_drag_pos_get_type" shared="true">
         <return-type type="GType" />
       </method>
-      <method name="DebugFlagGetType" cname="gtk_debug_flag_get_type" shared="true">
-        <return-type type="GType" />
-      </method>
       <method name="DisableSetlocale" cname="gtk_disable_setlocale" shared="true">
         <return-type type="void" />
       </method>
diff --git a/parser/gapi_pp.pl b/parser/gapi_pp.pl
index e48e3c5d2..c6c5aa3fc 100755
--- a/parser/gapi_pp.pl
+++ b/parser/gapi_pp.pl
@@ -81,6 +81,8 @@ foreach $fname (@hdrs) {
 			while ($line !~ /\*\//) {$line = <INFILE>;}
 		} elsif ($line =~ /^extern/) {
 			while ($line !~ /;/) {$line = <INFILE>;}
+		} elsif ($line =~ /^#ifndef\s+\w+_H_*\b/) {
+			while ($line !~ /#define/) {$line = <INFILE>;}
 		} elsif ($line =~ /$private_regex/) {
 			$nested = 0;
 			while ($line = <INFILE>) {