diff options
| author | Bruce Korb <bkorb@gnu.org> | 2000-02-26 23:16:59 +0000 |
|---|---|---|
| committer | Bruce Korb <korbb@gcc.gnu.org> | 2000-02-26 23:16:59 +0000 |
| commit | 42a2c30e1b583239136fab633057bb03518c26b3 (patch) | |
| tree | 2e55f099a3546dacbecd262f43f7bc60a1e7a92f /gcc/fixinc/fixincl.x | |
| parent | 4592bdcbb8fe793fa7dc89ed84afb6df7699c92e (diff) | |
| download | gcc-42a2c30e1b583239136fab633057bb03518c26b3.tar.gz | |
the undefine_null bypass pattern needs to match for DOS headers
From-SVN: r32199
Diffstat (limited to 'gcc/fixinc/fixincl.x')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 8c337640df3..f120a2391b6 100644 --- 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 }; |