From e1c553c646bdd49dbac07a064a9101ccf74c70c4 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Mon, 31 Dec 2001 10:40:48 +0000
Subject: [PATCH] 2001-12-31  Mike Kestner <mkestner@speakeasy.net>

	* codegen/defs-parse.pl : Fix EOL handling for DOS \r\n patterns as
	reported by David Dawkins.

svn path=/trunk/gtk-sharp/; revision=1763
---
 ChangeLog             | 5 +++++
 codegen/defs-parse.pl | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c36621c18..7ea2466da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-31  Mike Kestner <mkestner@speakeasy.net>
+
+	* codegen/defs-parse.pl : Fix EOL handling for DOS \r\n patterns as 
+	reported by David Dawkins.
+
 2001-12-11  Mike Kestner <mkestner@speakeasy.net>
 
 	* codegen/get-structs-from-source.pl : New define-struct extractor.
diff --git a/codegen/defs-parse.pl b/codegen/defs-parse.pl
index 35f2919ea..5ea76cc9e 100755
--- a/codegen/defs-parse.pl
+++ b/codegen/defs-parse.pl
@@ -35,7 +35,7 @@ while ($def = get_def()) {
 		$name = $1;
 		$def =~ /c-name "(\w+)"/;
 		$cname=$1;
-		$def =~ s/\n\s*//g;
+		$def =~ s/\r?\n\s*//g;
 		$structs{$cname} = $def;
 		$maptypes{$cname} = $name;
 		$marshaltypes{$cname} = $name;
@@ -43,19 +43,19 @@ while ($def = get_def()) {
 		$name = $1;
 		$def =~ /c-name "(\w+)"/;
 		$cname=$1;
-		$def =~ s/\n\s*//g;
+		$def =~ s/\r?\n\s*//g;
 		$objects{$cname} = $def;
 		$maptypes{$cname} = $name;
 		$marshaltypes{$cname} = "IntPtr";
 	} elsif ($def =~ /^\(define-(prop|signal|method)/) {
 		$def =~ /of-object "(\w+)"/;
 		$cname=$1;
-		$def =~ s/\n\s*//g;
+		$def =~ s/\r?\n\s*//g;
 		$objects{$cname} .= "\n$def";
 	} elsif ($def =~ /^\(define-function/) {
 		if ($def =~ /is-constructor-of (\w+)\)/) {
 			$cname=$1;
-			$def =~ s/\n\s*//g;
+			$def =~ s/\r?\n\s*//g;
 			$objects{$cname} .= "\n$def";
 		}
 	} elsif ($def =~ /^\(define-(interface)/) {