Index: headers.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/jam/src/headers.c,v
retrieving revision 1.6
diff -u -p -r1.6 headers.c
--- headers.c	1 Jun 2004 05:42:35 -0000	1.6
+++ headers.c	6 Jan 2007 19:50:31 -0000
@@ -148,6 +148,15 @@ headers1( 
 
 	while( fgets( buf, sizeof( buf ), f ) )
 	{
+            int size = strlen (buf);
+            /* Remove trailing \r and \n, if any. */
+            while (size > 0 
+                   && (buf[size-1] == '\n' && buf[size-1] == '\r'))
+            {
+                buf[size-1] = '\0';
+                --size;
+            }
+
 	    for( i = 0; i < rec; i++ )
 		if( regexec( re[i], buf ) && re[i]->startp[1] )
 	    {