hackshell.tpl: Complete transition to fixinc.tmp.

* fixinc/hackshell.tpl: Complete transition to fixinc.tmp.
        * fixinc/inclhack.sh: Rebuilt.

From-SVN: r26094
This commit is contained in:
Alexandre Oliva 1999-04-01 00:25:26 +00:00 committed by Jeff Law
parent adc8046e1d
commit 0cb97c8d0c
3 changed files with 109 additions and 106 deletions

View File

@ -1,5 +1,8 @@
Thu Apr 1 01:09:27 1999 Alexandre Oliva <oliva@dcc.unicamp.br>
* fixinc/hackshell.tpl: Complete transition to fixinc.tmp.
* fixinc/inclhack.sh: Rebuilt.
* fixinc/inclhack.def: Fix typos in c_asm.h fix.
* fixinc/fixincl.x, fixinc/inclhack.sh, fixinc/fixinc.sh: Rebuilt.

View File

@ -114,11 +114,11 @@ _FOR fix "\n\n" =]
sed [=
_FOR sed =]-e [=sed _shrstr=] \
[=
/sed=] < $infile > ${DESTFILE}.[=
/sed=] < $infile > ${DESTDIR}/fixinc.tmp[=
_ELIF shell _exist =]
( [=shell=] ) < $infile > ${DESTDIR}/FIXINC.tmp
( [=shell=] ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered

View File

@ -2,7 +2,7 @@
#
# DO NOT EDIT THIS FILE (inclhack.sh)
#
# It has been autogen-ed Thursday April 1, 1999 at 01:07:58 AM MST
# It has been autogen-ed Thursday April 1, 1999 at 01:17:17 AM MST
# From the definitions /puke/law//egcs/egcs/gcc/fixinc/inclhack.def
# and the template file /puke/law//egcs/egcs/gcc/fixinc/inclhack.tpl
#
@ -374,7 +374,7 @@ while [ $# != 0 ]; do
sed -e '/^extern pid_t wait3();$/i\
struct rusage;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -395,7 +395,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/typedef volatile int sig_atomic_t/typedef int sig_atomic_t/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -417,7 +417,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/getopt(int, char \*\[\],[ ]*char \*)/getopt(int, char *const[], const char *)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -438,7 +438,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/#ifndef(__mips64)/#ifndef __mips64/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -459,7 +459,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/char\([ ]*\*[ ]*sbrk[ ]*(\)/void\1/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -478,7 +478,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/___type p_type/p_type/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -499,7 +499,7 @@ struct rusage;
sed -e 's/\(#[ ]*ifndef[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
-e 's/\(#[ ]*define[ ]*\)__wchar_t/\1_GCC_WCHAR_T/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -520,7 +520,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's|#ifndef NOINLINE|#if !defined(NOINLINE) \&\& !defined(__GNUC__)|' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -553,7 +553,7 @@ struct rusage;
-e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -573,7 +573,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/^[ ]*typedef[ ][ ]*\(struct[ ][ ]*term[ ]*;[ ]*\)$/\1/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -592,7 +592,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/doesn'\''t/does not/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -625,7 +625,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/^[ ]*#[ ]*define[ ]*\([^(]*\)\(([^)]*)\)[ ]*\(_.\)\1\2[ ]*$/#define \1 \3\1/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -649,7 +649,7 @@ struct rusage;
sed -e '1i\
#include <stdio.h>
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -675,7 +675,7 @@ struct rusage;
#include <stdlib.h>\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -696,7 +696,7 @@ struct rusage;
sed -e '/[ ]BSD43__IO[A-Z]*[ ]*(/s/(\(.\),/('\''\1'\'',/' \
-e '/#[ ]*define[ ]*[ ]BSD43__IO/s/'\''\([cgx]\)'\''/\1/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -718,7 +718,7 @@ struct rusage;
-e '/^[ ]*#[ ]*pragma[ ]*intrinsic([ ]*dasm/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -738,7 +738,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e '/\/\/[^"*]/s|//.*$||g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -756,7 +756,7 @@ struct rusage;
else infile=${DESTFILE} ; fi
sed -e 's/ecd.cursor/ecd_cursor/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -781,7 +781,7 @@ s/\\$/\\+++fixinc_eol+++/
s/\\+++fixinc_eol+++/\\/g
s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1%
s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -806,7 +806,7 @@ s/\\+++fixinc_eol+++/\\/g
s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1%
s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1%
s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -826,7 +826,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
sed -e 's,"../machine/inline.h",<machine/inline.h>,' \
-e 's,"../machine/psl.h",<machine/psl.h>,' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -847,7 +847,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \
else infile=${DESTFILE} ; fi
sed -e 's/(\.\.\.)/(struct file * ...)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -879,7 +879,7 @@ extern "C" {\
}\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -903,7 +903,7 @@ extern "C" {\
-e '/^#[ ]*define[ ]*MAXINT[ ]/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -923,7 +923,7 @@ extern "C" {\
else infile=${DESTFILE} ; fi
sed -e 's/^extern struct sigevent;/struct sigevent;/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -950,7 +950,7 @@ extern "C" {\
else infile=${DESTFILE} ; fi
sed -e 's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -972,7 +972,7 @@ extern "C" {\
else infile=${DESTFILE} ; fi
sed -e 's/fmod(double)/fmod(double, double)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -995,7 +995,7 @@ extern "C" {\
sed -e '/CHILD_MAX/s,/\* Max, Max,' \
-e '/OPEN_MAX/s,/\* Max, Max,' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1017,7 +1017,7 @@ extern "C" {\
sed -e 's/\([ ](_|DES)IO[A-Z]*[ ]*(\)\([^,'\'']\),/\1'\''\2'\'',/' \
-e '/#[ ]*define[ ]*[ ]_IO/s/'\''\([cgxtf]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]DESIOC/s/'\''\([cdgx]\)'\''/\1/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1039,7 +1039,7 @@ extern "C" {\
-e '/#[ ]*define[ ]*[ ]CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
-e '/#[ ]*define[ ]*[ ]BSD43_CTRL/s/'\''\([cgx]\)'\''/\1/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1056,7 +1056,7 @@ extern "C" {\
else infile=${DESTFILE} ; fi
sed -e '/^struct/,/^};/s/}$/};/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1075,7 +1075,7 @@ extern "C" {\
sed -e 's@type of the result@type of the result */@' \
-e 's@of the sizeof@/* of the sizeof@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1097,7 +1097,7 @@ extern "C" {\
sed -e '/authdes_create.*struct sockaddr/i\
struct sockaddr;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1118,7 +1118,7 @@ struct sockaddr;
sed -e '/xdrstdio_create.*struct __file_s/i\
struct __file_s;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1138,7 +1138,7 @@ struct __file_s;
else infile=${DESTFILE} ; fi
sed -e 's/fmod(double)/fmod(double, double)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1160,7 +1160,7 @@ struct __file_s;
sed -e 's@^\(#undef[ ][ ]*PIPE_BUF[ ]*/\* max # bytes atomic in write to a\)$@\1 */@' \
-e 's@\(/\*#define HUGE_VAL 3.40282346638528860e+38 \)\(/\*error value returned by Math lib\*/\)$@\1*/ \2@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
@ -1183,7 +1183,7 @@ struct __file_s;
sed -e '/CHILD_MAX/s,/\* Max, Max,' \
-e '/OPEN_MAX/s,/\* Max, Max,' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1221,7 +1221,7 @@ struct __file_s;
else infile=${DESTFILE} ; fi
sed -e 's|/\*\*/|##|g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1278,7 +1278,7 @@ struct __file_s;
#endif
' \
-e '/^\(\/\*#define HUGE_VAL 3\.[0-9e+]* *\)\/\*/s//\1/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1299,7 +1299,7 @@ struct __file_s;
else infile=${DESTFILE} ; fi
sed -e '/#[ ]*define[ ][ ]*void[ ]int/d' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1320,7 +1320,7 @@ struct __file_s;
else infile=${DESTFILE} ; fi
sed -e 's/\(fcntl.*(int, int, \)int)/\1...)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1354,7 +1354,7 @@ static __inline__ double fake_hypot (x, y)\
}\
#define hypot fake_hypot
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
@ -1378,7 +1378,7 @@ static __inline__ double fake_hypot (x, y)\
sed -e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(S_IF[A-Z][A-Z][A-Z][A-Z]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
-e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(0[0-9]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1405,7 +1405,7 @@ static __inline__ double fake_hypot (x, y)\
echo "#ifndef __GCC_GOT_${cpp_wrapper}_"
echo "#define __GCC_GOT_${cpp_wrapper}_"
cat
echo "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */" ) < $infile > ${DESTDIR}/FIXINC.tmp
echo "#endif /* ! __GCC_GOT_${cpp_wrapper}_ */" ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -1467,7 +1467,7 @@ s/\\+++fixinc_eol+++/\\/g
s/ vax / __vax__ /g
s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g
}' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1505,7 +1505,7 @@ s/\\+++fixinc_eol+++/\\/g
#undef exception\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1534,7 +1534,7 @@ s/\\+++fixinc_eol+++/\\/g
#ifndef HUGE_VAL
' -e'/define[ ]HUGE_VAL[ ]/a\
#endif
' ) < $infile > ${DESTDIR}/FIXINC.tmp
' ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -1558,7 +1558,7 @@ s/\\+++fixinc_eol+++/\\/g
else infile=${DESTFILE} ; fi
sed -e 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1583,7 +1583,7 @@ s/\\+++fixinc_eol+++/\\/g
-e '/^#include <stdlib.h>/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1608,7 +1608,7 @@ s/\\+++fixinc_eol+++/\\/g
-e '/^extern.*double.*__const__.*cos(/s/__const__//' \
-e '/^extern.*double.*__const__.*hypot(/s/__const__//' \
-e '/^extern.*double.*__const__.*sin(/s/__const__//' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1630,7 +1630,7 @@ s/\\+++fixinc_eol+++/\\/g
sed -e '/\(.*template\)/s/template//' \
-e '/extern.*volatile.*void.*abort/s/volatile//' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1652,7 +1652,7 @@ s/\\+++fixinc_eol+++/\\/g
sed -e '/extern.*volatile.*void.*exit/s/volatile//' \
-e '/extern.*volatile.*void.*abort/s/volatile//' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1673,7 +1673,7 @@ s/\\+++fixinc_eol+++/\\/g
else infile=${DESTFILE} ; fi
sed -e 's@wait(union wait@wait(void@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1692,7 +1692,7 @@ s/\\+++fixinc_eol+++/\\/g
else infile=${DESTFILE} ; fi
sed -e 's/char.*na_addr *$/char *na_addr;/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1718,7 +1718,7 @@ s/\\+++fixinc_eol+++/\\/g
sed -e 's/regex_t/__regex_t/g' \
-e 's/regoff_t/__regoff_t/g' \
-e 's/regmatch_t/__regmatch_t/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1746,7 +1746,7 @@ typedef __regex_t regex_t;\
typedef __regoff_t regoff_t;\
typedef __regmatch_t regmatch_t;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1767,7 +1767,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's/^int __page_size/extern int __page_size/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1793,7 +1793,7 @@ typedef __regmatch_t regmatch_t;
-e '/class[(]/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1814,7 +1814,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's/fchmod(char \*/fchmod(int/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1834,7 +1834,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -1854,7 +1854,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's@"../machine/endian.h"@<machine/endian.h>@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1875,7 +1875,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's/boottime$/boottime;/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1909,7 +1909,7 @@ typedef __regmatch_t regmatch_t;
-e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
-e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
-e 's@VA_LIST@DUMMY_VA_LIST@' \
-e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/FIXINC.tmp
-e 's@_Va_LIST@_VA_LIST@' ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -1936,7 +1936,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1957,7 +1957,7 @@ typedef __regmatch_t regmatch_t;
else infile=${DESTFILE} ; fi
sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -1985,7 +1985,7 @@ typedef __regmatch_t regmatch_t;
-e '/^#define[ ]CAT(a,b)/ a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2007,7 +2007,7 @@ typedef __regmatch_t regmatch_t;
-e 's/int[ ][ ]*free/void free/g' \
-e 's/char\([ ]*\*[ ]*malloc\)/void\1/g' \
-e 's/char\([ ]*\*[ ]*realloc\)/void\1/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2048,7 +2048,7 @@ extern int memcmp();\
#endif /* __memory_h__ */
' \
-e '1,$d' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2069,7 +2069,7 @@ extern int memcmp();\
else infile=${DESTFILE} ; fi
sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2098,7 +2098,7 @@ void (*signal(...))(...);\
-e '/^void (\*signal())();$/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2129,7 +2129,7 @@ void (*signal(...))(...);\
#else\
\1\2\
#endif/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2153,7 +2153,7 @@ void (*signal(...))(...);\
-e '/matherr/i\
struct exception;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2171,7 +2171,7 @@ struct exception;
else infile=${DESTFILE} ; fi
sed -e 's/int[ ]*strlen();/__SIZE_TYPE__ strlen();/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2224,7 +2224,7 @@ typedef __SIZE_TYPE__ size_t;\
#endif
' \
-e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2252,7 +2252,7 @@ typedef __SIZE_TYPE__ size_t;\
-e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2281,7 +2281,7 @@ extern unsigned int\
\2/' \
-e '/^extern int$/N' \
-e 's/^extern int\(\n strlen(),\)/extern size_t\1/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2313,7 +2313,7 @@ extern unsigned int\
-e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for machine type test
@ -2353,7 +2353,7 @@ extern unsigned int\
-e '/[ ]wchar_t.*;/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2371,7 +2371,7 @@ extern unsigned int\
else infile=${DESTFILE} ; fi
sed -e 's/[ ]_cplusplus/ __cplusplus/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2394,7 +2394,7 @@ extern unsigned int\
/* This file intentionally left blank. */
' \
-e '1,$d' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2417,7 +2417,7 @@ extern unsigned int\
sed -e '/^[ ]*extern[ ]*int[ ]*uname();$/i\
struct utsname;
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2440,7 +2440,7 @@ struct utsname;
-e 's@inline double abs(double [a-z][a-z]*) {.*}@@' \
-e 's@inline int sqr(int [a-z][a-z]*) {.*}@@' \
-e 's@inline double sqr(double [a-z][a-z]*) {.*}@@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2466,7 +2466,7 @@ struct utsname;
-e 's@sscanf( char \*__s, char \*__format,@sscanf( const char *__s, const char *__format,@' \
-e 's@popen(char \*, char \*);@popen(const char *, const char *);@' \
-e 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2486,7 +2486,7 @@ struct utsname;
else infile=${DESTFILE} ; fi
sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2505,7 +2505,7 @@ struct utsname;
else infile=${DESTFILE} ; fi
sed -e 's@^\( \* int protocol; \)/\*@\1*/ /*@' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2527,7 +2527,7 @@ struct utsname;
sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' \
-e 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/' \
-e 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2550,7 +2550,7 @@ struct utsname;
sed -e '/^#[ ]*define[ ][ ]*NULL[ ]/i\
#undef NULL
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2572,7 +2572,7 @@ struct utsname;
-e 's/__vali/__vxvali/' \
-e 's/__vpad/__vxvpad/' \
-e 's/__alignof__/__vxalignof__/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2603,7 +2603,7 @@ struct utsname;
else infile=${DESTFILE} ; fi
sed -e 's/^#[ ]*define[ ]*NULL[ ]*((void[ ]*\*)0)/#define NULL 0/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2645,7 +2645,7 @@ struct utsname;
-e '/[ ]wchar_t/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2666,7 +2666,7 @@ struct utsname;
else infile=${DESTFILE} ; fi
sed -e 's/uint_t/unsigned int/' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2692,7 +2692,7 @@ struct utsname;
sed -e '/#[ ]define[ ][ ]*__INCstath/a\
#include <types/vxTypesOld.h>
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2724,7 +2724,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#endif
' \
-e 's/VOIDFUNCPTR/__gcc_VOIDFUNCPTR/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2752,7 +2752,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
-e '/char \*class;/a\
#endif
' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2773,7 +2773,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
else infile=${DESTFILE} ; fi
sed -e 's/ class[)]/ c_class)/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2802,7 +2802,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
#endif
' \
-e 's/Widget new,/Widget c_new,/g' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
fi # end of selection 'if'
@ -2823,7 +2823,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\
sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\
extern char * sprintf();\
#endif /* !defined __STDC__ */,' \
< $infile > ${DESTFILE}.
< $infile > ${DESTDIR}/fixinc.tmp
rm -f ${DESTFILE}
mv -f ${DESTDIR}/fixinc.tmp ${DESTFILE}
;; # case end for file name test
@ -2843,7 +2843,7 @@ extern char * sprintf();\
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -2870,7 +2870,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -2897,7 +2897,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -2924,7 +2924,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -2949,7 +2949,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered
@ -2975,7 +2975,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
else infile=${DESTFILE} ; fi
( echo "Removing incorrect fix to <$file>" >&2
rm -f ${DESTDIR}/$file ${DESTDIR}/$file.
cat > /dev/null ) < $infile > ${DESTDIR}/FIXINC.tmp
cat > /dev/null ) < $infile > ${DESTDIR}/fixinc.tmp
# Shell scripts have the potential of removing the output
# We interpret that to mean the file is not to be altered