--- cpp_re.inc.save	2007-03-23 17:37:56.000000000 -0600
+++ cpp_re.inc	2007-03-23 18:22:44.000000000 -0600
@@ -725,7 +725,7 @@
         ++YYCURSOR;
 #line 289 "cpp.re"
         {
-        if(cursor != s->eof) 
+        if(s->eof && cursor != s->eof) 
         {
             BOOST_WAVE_UPDATE_CURSOR();     // adjust the input cursor
             (*s->error_proc)(s, "invalid character '\\000' in input stream");
--- strict_cpp_re.inc.save	2007-03-23 18:17:26.000000000 -0600
+++ strict_cpp_re.inc	2007-03-23 18:23:13.000000000 -0600
@@ -724,7 +724,7 @@
         ++YYCURSOR;
 #line 289 "strict_cpp.re"
         {
-        if(cursor != s->eof) 
+        if(s->eof && cursor != s->eof) 
         {
             BOOST_WAVE_UPDATE_CURSOR();     // adjust the input cursor
             (*s->error_proc)(s, "invalid character '\\000' in input stream");