From 52866495a0123c3ad7ada8a31555a57c9173f6ff Mon Sep 17 00:00:00 2001
From: guy <guy>
Date: Sat, 8 Feb 2003 19:27:00 +0000
Subject: [PATCH] From Gisle Vanem <giva@bgnett.no>: treat CR as white space in
 expressions.

---
 CREDITS   | 1 +
 scanner.l | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CREDITS b/CREDITS
index a701f41..ee26f8c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -27,6 +27,7 @@ Additional people who have contributed patches:
 	Don Ebright			<Don.Ebright@compuware.com> 
 	Franz Schaefer			<schaefer@mond.at>
 	Gianluca Varenni		<varenni@netgroup-serv.polito.it>
+	Gisle Vanem			<giva@bgnett.no>
 	Graeme Hewson			<ghewson@cix.compulink.co.uk>
 	Greg Stark			<gsstark@mit.edu>
 	Greg Troxel			<gdt@ir.bbn.com>
diff --git a/scanner.l b/scanner.l
index d7fd4bf..36f51d4 100644
--- a/scanner.l
+++ b/scanner.l
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.91 2002-12-06 00:01:35 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/scanner.l,v 1.92 2003-02-08 19:27:01 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -276,7 +276,7 @@ vci		return VCI;
 connectmsg	return CONNECTMSG;
 metaconnect	return METACONNECT;
 
-[ \n\t]			;
+[ \r\n\t]		;
 [+\-*/:\[\]!<>()&|=]	return yytext[0];
 ">="			return GEQ;
 "<="			return LEQ;