+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
* 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[] = {
* 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 };
*/
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";
};
#
# 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"
then infile=${file}
else infile=${DESTFILE} ; fi
- sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
+ sed -e '/^#[ ]*define[ ][ ]*NULL[ \r]/i\
#undef NULL
' \
< $infile > ${DESTDIR}/fixinc.tmp