the undefine_null bypass pattern needs to match for DOS headers

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32199 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67ed4eb..7a5f669 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-26  Bruce Korb  <bkorb@gnu.org>
+
+       fixinc/inclhack.def(undefine_null): the bypass pattern needs to
+       match for DOS headers, too.
+       fixinc/inclhack.sh,fixincl.x: regen
+
 2000-02-26  Geoff Keating  <geoffk@cygnus.com>
 
        * config/elfos.h (ASM_OUTPUT_LABELREF): Don't define.  The default

diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index 8c33764..f120a23 100644 (file)
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -4010,13 +4010,13 @@ tSCC zUndefine_NullName[] =
  *  content selection pattern - do fix if pattern found
  */
 tSCC zUndefine_NullSelect0[] =
-       "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
+       "^#[ \t]*define[ \t]*[ \t]NULL[ \t\r]";
 
 /*
  *  content bypass pattern - skip fix if pattern found
  */
 tSCC zUndefine_NullBypass0[] =
-       "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
+       "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t\r])";
 
 #define    UNDEFINE_NULL_TEST_CT  2
 tTestDesc aUndefine_NullTests[] = {
@@ -4027,7 +4027,7 @@ tTestDesc aUndefine_NullTests[] = {
  *  Fix Command Arguments for Undefine_Null
  */
 const char* apzUndefine_NullPatch[] = { "sed",
-    "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n\
+    "-e", "/^#[ \t]*define[ \t][ \t]*NULL[ \t\r]/i\\\n\
 #undef NULL\n",
     (char*)NULL };
 

diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def
index 0cd35ec..e431d1f 100644 (file)
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2387,9 +2387,9 @@ fix = {
  */
 fix = {
     hackname = undefine_null;
-    select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t]";
-    bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t])";
-    sed    = "/^#[ \t]*define[ \t][ \t]*NULL[ \t]/i\\\n"
+    select = "^#[ \t]*define[ \t]*[ \t]NULL[ \t\r]";
+    bypass = "#[ \t]*(ifn|un)def[ \t]*[ \t]NULL($|[ \t\r])";
+    sed    = "/^#[ \t]*define[ \t][ \t]*NULL[ \t\r]/i\\\n"
                 "#undef NULL\n";
 };
 

diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh
index 9d71cad..06e0815 100755 (executable)
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -3069,9 +3069,9 @@ struct utsname;
     #
     # Fix Undefine_Null
     #
-    if ( test -n "`egrep '^#[  ]*define[       ]*[     ]NULL[  ]' ${file}`"
+    if ( test -n "`egrep '^#[  ]*define[       ]*[     ]NULL[  \r]' ${file}`"
        ) > /dev/null 2>&1 ; then
-    if ( test -z "`egrep '#[   ]*(ifn|un)def[  ]*[     ]NULL($|[       ])' ${file}`"
+    if ( test -z "`egrep '#[   ]*(ifn|un)def[  ]*[     ]NULL($|[       \r])' ${file}`"
        ) > /dev/null 2>&1 ; then
     fixlist="${fixlist}
       undefine_null"
@@ -3079,7 +3079,7 @@ struct utsname;
     then infile=${file}
     else infile=${DESTFILE} ; fi 
 
-    sed -e '/^#[       ]*define[       ][      ]*NULL[         ]/i\
+    sed -e '/^#[       ]*define[       ][      ]*NULL[         \r]/i\
 #undef NULL
 ' \
           < $infile > ${DESTDIR}/fixinc.tmp