diff options
Diffstat (limited to 'contrib/fixinc/inclhack.sh')
-rwxr-xr-x | contrib/fixinc/inclhack.sh | 282 |
1 files changed, 100 insertions, 182 deletions
diff --git a/contrib/fixinc/inclhack.sh b/contrib/fixinc/inclhack.sh index e0f3e49e160..7647fd58841 100755 --- a/contrib/fixinc/inclhack.sh +++ b/contrib/fixinc/inclhack.sh @@ -1,8 +1,8 @@ -#!/bin/sh -p +#!/bin/sh # # DO NOT EDIT THIS FILE (inclhack.sh) # -# It has been autogen-ed Wednesday September 9, 1998 at 04:44:05 PM PDT +# It has been autogen-ed Tuesday September 22, 1998 at 07:22:34 AM PDT # From the definitions inclhack.def # and the template file inclhack.tpl # @@ -10,7 +10,7 @@ # files which are fixed to work correctly with ANSI C and placed in a # directory that GNU C will search. # -# This script contains 108 fixup scripts. +# This script contains 104 fixup scripts. # # See README-fixinc for more information. # @@ -697,89 +697,45 @@ extern "C" {\ # - # Fix 17: Cxx_Cmnt_Hpux + # Fix 17: No_Double_Slash # - case "$file" in ./sys/pci.h ) - if ( test -n "`egrep 'System Private Structures' $file`" + if ( test -n "`egrep '//[^*]' $file`" -a \ + '(' -z "`echo ${file}|egrep '++$|\.hh$|\.H$'`" ')' ) > /dev/null 2>&1 ; then fixlist="${fixlist} - cxx_cmnt_hpux" + no_double_slash" if [ ! -r ${DESTDIR}/$file ] then infile=$file else infile=${DESTDIR}/$file ; fi - sed -e 's|//.*$||g' \ + sed -e '/\/\/[^*]/s|//.*$||g' \ < $infile > ${DESTDIR}/$file. mv -f ${DESTDIR}/$file. ${DESTDIR}/$file fi # end of selection 'if' - ;; # case end for file name test - esac # - # Fix 18: Cxx_Cmnt_Irix - # - case "$file" in ./fam.h ) - if ( test -n "`egrep 'indigo.esd' $file`" - ) > /dev/null 2>&1 ; then - fixlist="${fixlist} - cxx_cmnt_irix" - if [ ! -r ${DESTDIR}/$file ] - then infile=$file - else infile=${DESTDIR}/$file ; fi - - sed -e 's|//.*$||g' \ - < $infile > ${DESTDIR}/$file. - - mv -f ${DESTDIR}/$file. ${DESTDIR}/$file - fi # end of selection 'if' - ;; # case end for file name test - esac - - + # Fix 18: Irix_Bogus_Cxx_Cmnt # - # Fix 19: Cxx_Cmnt_Sunos - # - case "$file" in ./sbusdev/audiovar.h | \ - ./sys/audiovar.h ) - fixlist="${fixlist} - cxx_cmnt_sunos" - if [ ! -r ${DESTDIR}/$file ] - then infile=$file - else infile=${DESTDIR}/$file ; fi - - sed -e 's|//.*$||g' \ - < $infile > ${DESTDIR}/$file. - - mv -f ${DESTDIR}/$file. ${DESTDIR}/$file - ;; # case end for file name test - esac - - - # - # Fix 20: Cxx_Cmnt_Vxworks - # - case "$file" in ./drv/netif/if_med.h ) - if ( test -n "`egrep 'Wind River' $file`" - ) > /dev/null 2>&1 ; then + case "$file" in ./elf_abi.h | \ + ./elf.h ) fixlist="${fixlist} - cxx_cmnt_vxworks" + irix_bogus_cxx_cmnt" if [ ! -r ${DESTDIR}/$file ] then infile=$file else infile=${DESTDIR}/$file ; fi - sed -e 's|//.*$||g' \ + sed -e 's@"/\*"\*/@"//"@' \ < $infile > ${DESTDIR}/$file. mv -f ${DESTDIR}/$file. ${DESTDIR}/$file - fi # end of selection 'if' ;; # case end for file name test esac # - # Fix 21: Ecd_Cursor + # Fix 19: Ecd_Cursor # case "$file" in ./sunwindow/win_lock.h | \ ./sunwindow/win_cursor.h ) @@ -798,7 +754,7 @@ extern "C" {\ # - # Fix 22: Else_Label + # Fix 20: Else_Label # if ( test -n "`egrep '^[ ]*#[ ]*else[ ]+[!-.0-~]' $file`" ) > /dev/null 2>&1 ; then @@ -822,7 +778,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \ # - # Fix 23: Endif_Label + # Fix 21: Endif_Label # if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' $file`" ) > /dev/null 2>&1 ; then @@ -847,7 +803,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ # - # Fix 24: Hp_Inline + # Fix 22: Hp_Inline # case "$file" in ./sys/spinlock.h ) if ( test -n "`egrep 'include.*\"\\.\\./machine/' $file`" @@ -869,7 +825,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ # - # Fix 25: Hp_Sysfile + # Fix 23: Hp_Sysfile # case "$file" in ./sys/file.h ) if ( test -n "`egrep 'HPUX_SOURCE' $file`" @@ -890,7 +846,7 @@ s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%' \ # - # Fix 26: Hpux_Cxx_Unready + # Fix 24: Hpux_Cxx_Unready # case "$file" in ./sys/mman.h ) if ( test -z "`egrep '\"C\"|__BEGIN_DECLS' $file`" @@ -921,7 +877,7 @@ extern "C" {\ # - # Fix 27: Hpux_Maxint + # Fix 25: Hpux_Maxint # case "$file" in ./sys/param.h ) fixlist="${fixlist} @@ -944,7 +900,7 @@ extern "C" {\ # - # Fix 28: Hpux_Systime + # Fix 26: Hpux_Systime # case "$file" in ./sys/time.h ) if ( test -n "`egrep '^extern struct sigevent;' $file`" @@ -965,7 +921,7 @@ extern "C" {\ # - # Fix 29: Interactv_Add1 + # Fix 27: Interactv_Add1 # case "$file" in ./stdio.h | \ ./math.h | \ @@ -992,7 +948,7 @@ extern "C" {\ # - # Fix 30: Interactv_Add2 + # Fix 28: Interactv_Add2 # case "$file" in ./math.h ) if ( test '(' -d /etc/conf/kconfig.d ')' -a \ @@ -1014,7 +970,7 @@ extern "C" {\ # - # Fix 31: Interactv_Add3 + # Fix 29: Interactv_Add3 # case "$file" in ./sys/limits.h ) if ( test '(' -d /etc/conf/kconfig.d ')' -a \ @@ -1037,7 +993,7 @@ extern "C" {\ # - # Fix 32: Io_Def_Quotes + # Fix 30: Io_Def_Quotes # if ( test -n "`egrep '[ ]_IO[A-Z]*[ ]*\\([A-Za-z]' $file`" ) > /dev/null 2>&1 ; then @@ -1057,7 +1013,7 @@ extern "C" {\ # - # Fix 33: Ioctl_Fix_Ctrl + # Fix 31: Ioctl_Fix_Ctrl # if ( test -n "`egrep 'CTRL[ ]' $file`" ) > /dev/null 2>&1 ; then @@ -1079,7 +1035,7 @@ extern "C" {\ # - # Fix 34: Ip_Missing_Semi + # Fix 32: Ip_Missing_Semi # case "$file" in ./netinet/ip.h ) fixlist="${fixlist} @@ -1097,26 +1053,7 @@ extern "C" {\ # - # Fix 35: Irix_Bogus_Cxx_Cmnt - # - case "$file" in ./elf_abi.h | \ - ./elf.h ) - fixlist="${fixlist} - irix_bogus_cxx_cmnt" - if [ ! -r ${DESTDIR}/$file ] - then infile=$file - else infile=${DESTDIR}/$file ; fi - - sed -e 's@"/\*"\*/@"//"@' \ - < $infile > ${DESTDIR}/$file. - - mv -f ${DESTDIR}/$file. ${DESTDIR}/$file - ;; # case end for file name test - esac - - - # - # Fix 36: Irix_Multiline_Cmnt + # Fix 33: Irix_Multiline_Cmnt # case "$file" in ./sys/types.h ) fixlist="${fixlist} @@ -1135,7 +1072,7 @@ extern "C" {\ # - # Fix 37: Irix_Sockaddr + # Fix 34: Irix_Sockaddr # case "$file" in ./rpc/auth.h ) if ( test -n "`egrep 'authdes_create.*struct sockaddr' $file`" @@ -1158,7 +1095,7 @@ struct sockaddr; # - # Fix 38: Irix_Struct__File + # Fix 35: Irix_Struct__File # case "$file" in ./rpc/xdr.h ) fixlist="${fixlist} @@ -1178,7 +1115,7 @@ struct __file_s; # - # Fix 39: Isc_Fmod + # Fix 36: Isc_Fmod # case "$file" in ./math.h ) if ( test -n "`egrep 'fmod\\(double\\)' $file`" @@ -1199,7 +1136,7 @@ struct __file_s; # - # Fix 40: Motorola_Nested + # Fix 37: Motorola_Nested # case "$file" in ./limits.h | \ ./sys/limits.h ) @@ -1219,7 +1156,7 @@ struct __file_s; # - # Fix 41: Isc_Sys_Limits + # Fix 38: Isc_Sys_Limits # case "$file" in ./sys/limits.h ) if ( test -n "`egrep 'CHILD_MAX' $file`" @@ -1241,7 +1178,7 @@ struct __file_s; # - # Fix 42: Kandr_Concat + # Fix 39: Kandr_Concat # case "$file" in ./sparc/asm_linkage.h | \ ./sun3/asm_linkage.h | \ @@ -1279,7 +1216,7 @@ struct __file_s; # - # Fix 43: Limits_Ifndefs + # Fix 40: Limits_Ifndefs # case "$file" in ./limits.h ) if ( test -z "`egrep 'ifndef[ ]+FLT_MIN' $file`" @@ -1336,7 +1273,7 @@ struct __file_s; # - # Fix 44: Lynx_Void_Int + # Fix 41: Lynx_Void_Int # case "$file" in ./curses.h ) if ( test -n "`egrep '#[ ]*define[ ]+void[ ]+int' $file`" @@ -1357,7 +1294,7 @@ struct __file_s; # - # Fix 45: Lynxos_Fcntl_Proto + # Fix 42: Lynxos_Fcntl_Proto # case "$file" in ./fcntl.h ) fixlist="${fixlist} @@ -1375,7 +1312,7 @@ struct __file_s; # - # Fix 46: M88k_Bad_Hypot_Opt + # Fix 43: M88k_Bad_Hypot_Opt # case "$file" in ./math.h ) case "$target_canonical" in m88k-motorola-sysv3* ) @@ -1410,7 +1347,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 47: M88k_Bad_S_If + # Fix 44: M88k_Bad_S_If # case "$file" in ./sys/stat.h ) case "$target_canonical" in m88k-*-sysv3* ) @@ -1435,7 +1372,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 48: M88k_Multi_Incl + # Fix 45: M88k_Multi_Incl # case "$file" in ./time.h ) case "$target_canonical" in m88k-tektronix-sysv3* ) @@ -1471,7 +1408,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 49: Machine_Name + # Fix 46: Machine_Name # if ( test -n "`egrep '^#[ ]*(if|elif).*[^a-zA-Z0-9_](_*[MSRrhim]|[Mbimnpstuv])[a-zA-Z0-9_]' $file`" ) > /dev/null 2>&1 ; then @@ -1523,7 +1460,7 @@ s/\\+++fixinc_eol+++/\\/g # - # Fix 50: Math_Exception + # Fix 47: Math_Exception # case "$file" in ./math.h ) if ( test -n "`egrep 'struct exception' $file`" @@ -1563,7 +1500,7 @@ s/\\+++fixinc_eol+++/\\/g # - # Fix 51: Math_Gcc_Ifndefs + # Fix 48: Math_Gcc_Ifndefs # case "$file" in ./math.h ) fixlist="${fixlist} @@ -1604,7 +1541,7 @@ s/\\+++fixinc_eol+++/\\/g # - # Fix 52: Motorola_Stupid_Opt + # Fix 49: Motorola_Stupid_Opt # case "$file" in ./math.h ) case "$target_canonical" in m88k-motorola-sysv3* ) @@ -1641,7 +1578,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 53: Nested_Comment + # Fix 50: Nested_Comment # case "$file" in ./rpc/rpc.h ) fixlist="${fixlist} @@ -1659,7 +1596,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 54: News_Os_Recursion + # Fix 51: News_Os_Recursion # case "$file" in ./stdlib.h ) if ( test -n "`egrep '#include <stdlib.h>' $file`" @@ -1685,7 +1622,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 55: Next_Math_Prefix + # Fix 52: Next_Math_Prefix # case "$file" in ./ansi/math.h ) if ( test -n "`egrep '^extern.*double.*__const__.*' $file`" @@ -1710,7 +1647,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 56: Next_Template + # Fix 53: Next_Template # case "$file" in ./bsd/libc.h ) if ( test -n "`egrep 'template' $file`" @@ -1732,7 +1669,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 57: Next_Volitile + # Fix 54: Next_Volitile # case "$file" in ./ansi/stdlib.h ) if ( test -n "`egrep 'volatile' $file`" @@ -1754,7 +1691,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 58: Next_Wait_Union + # Fix 55: Next_Wait_Union # case "$file" in ./sys/wait.h ) if ( test -n "`egrep 'wait\\(union wait' $file`" @@ -1775,26 +1712,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 59: No_Double_Slash - # - if ( test -n "`egrep '//[^*]' $file`" -a \ - '(' -z "`echo ${file}|egrep '++|\.hh$|\.H$'`" ')' - ) > /dev/null 2>&1 ; then - fixlist="${fixlist} - no_double_slash" - if [ ! -r ${DESTDIR}/$file ] - then infile=$file - else infile=${DESTDIR}/$file ; fi - - sed -e '/\/\/[^*]/s|//\(.*\)$|/* \1 */|' \ - < $infile > ${DESTDIR}/$file. - - mv -f ${DESTDIR}/$file. ${DESTDIR}/$file - fi # end of selection 'if' - - - # - # Fix 60: Nodeent_Syntax + # Fix 56: Nodeent_Syntax # case "$file" in ./netdnet/dnetdb.h ) fixlist="${fixlist} @@ -1812,7 +1730,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 61: Osf_Namespace_A + # Fix 57: Osf_Namespace_A # case "$file" in ./reg_types.h | \ ./sys/lc_core.h ) @@ -1836,7 +1754,7 @@ static __inline__ double fake_hypot (x, y)\ # - # Fix 62: Osf_Namespace_B + # Fix 58: Osf_Namespace_B # case "$file" in ./regex.h ) if ( test '(' -r reg_types.h-a -r sys/lc_core.h-a -n "`grep '} regex_t;' reg_types.h`"-a -z "`grep __regex_t regex.h`" ')' @@ -1861,7 +1779,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 63: Pthread_Page_Size + # Fix 59: Pthread_Page_Size # case "$file" in ./pthread.h ) if ( test -n "`egrep '^int __page_size' $file`" @@ -1882,7 +1800,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 64: Rs6000_Double + # Fix 60: Rs6000_Double # case "$file" in ./math.h ) if ( test -n "`egrep '[^a-zA-Z_]class\\(' $file`" @@ -1908,7 +1826,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 65: Rs6000_Fchmod + # Fix 61: Rs6000_Fchmod # case "$file" in ./sys/stat.h ) if ( test -n "`egrep 'fchmod\\(char' $file`" @@ -1929,7 +1847,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 66: Rs6000_Param + # Fix 62: Rs6000_Param # case "$file" in ./stdio.h | \ ./unistd.h ) @@ -1948,7 +1866,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 67: Sony_Include + # Fix 63: Sony_Include # case "$file" in ./machine/machparam.h ) if ( test -n "`egrep '\"\\.\\./machine/endian.h\"' $file`" @@ -1969,7 +1887,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 68: Statsswtch + # Fix 64: Statsswtch # case "$file" in ./rpcsvc/rstat.h ) if ( test -n "`egrep 'boottime$' $file`" @@ -1990,7 +1908,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 69: Stdio_Va_List + # Fix 65: Stdio_Va_List # case "$file" in ./stdio.h ) fixlist="${fixlist} @@ -2029,7 +1947,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 70: Sun_Bogus_Ifdef + # Fix 66: Sun_Bogus_Ifdef # case "$file" in ./hsfs/hsfs_spec.h | \ ./hsfs/iso_spec.h ) @@ -2051,7 +1969,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 71: Sun_Bogus_Ifdef_Sun4c + # Fix 67: Sun_Bogus_Ifdef_Sun4c # case "$file" in ./hsfs/hsnode.h ) if ( test -n "`egrep '#ifdef __i386__ || __sun4c__' $file`" @@ -2072,7 +1990,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 72: Sun_Catmacro + # Fix 68: Sun_Catmacro # case "$file" in ./pixrect/memvar.h ) if ( test -n "`egrep '^#define[ ]+CAT(a,b)' $file`" @@ -2100,7 +2018,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 73: Sun_Malloc + # Fix 69: Sun_Malloc # case "$file" in ./malloc.h ) fixlist="${fixlist} @@ -2121,7 +2039,7 @@ typedef __regmatch_t regmatch_t; # - # Fix 74: Sun_Memcpy + # Fix 70: Sun_Memcpy # case "$file" in ./memory.h ) if ( test -n "`egrep '/\\* @\\(#\\)(head/memory.h 50.1 |memory\\.h 1\\.[2-4] 8./../.. SMI; from S5R2 1\\.2 )\\*/' $file`" @@ -2163,7 +2081,7 @@ extern int memcmp();\ # - # Fix 75: Sun_Rusers_Semi + # Fix 71: Sun_Rusers_Semi # case "$file" in ./rpcsvc/rusers.h ) if ( test -n "`egrep '_cnt$' $file`" @@ -2184,7 +2102,7 @@ extern int memcmp();\ # - # Fix 76: Sun_Signal + # Fix 72: Sun_Signal # case "$file" in ./sys/signal.h | \ ./signal.h ) @@ -2213,7 +2131,7 @@ void (*signal(...))(...);\ # - # Fix 77: Sun_Xdr_Proto + # Fix 73: Sun_Xdr_Proto # case "$file" in ./rpc/xdr.h ) fixlist="${fixlist} @@ -2236,7 +2154,7 @@ void (*signal(...))(...);\ # - # Fix 78: Sunos_Large_Macro + # Fix 74: Sunos_Large_Macro # case "$file" in ./sundev/ipi_error.h ) fixlist="${fixlist} @@ -2260,7 +2178,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. # - # Fix 79: Sunos_Matherr_Decl + # Fix 75: Sunos_Matherr_Decl # case "$file" in ./math.h ) if ( test '(' "`fgrep 'struct exception' $file | line`" != 'struct exception {' ')' @@ -2283,7 +2201,7 @@ struct exception; # - # Fix 80: Sunos_Strlen + # Fix 76: Sunos_Strlen # case "$file" in ./strings.h ) fixlist="${fixlist} @@ -2301,7 +2219,7 @@ struct exception; # - # Fix 81: Systypes + # Fix 77: Systypes # case "$file" in ./sys/types.h | \ ./stdlib.h | \ @@ -2317,7 +2235,7 @@ struct exception; then infile=$file else infile=${DESTDIR}/$file ; fi - sed -e '/^[ ]**[ ]*typedef unsigned int size_t;/N' \ + sed -e '/^[ ]*\*[ ]*typedef unsigned int size_t;/N' \ -e 's/^\([ ]*\*[ ]*typedef unsigned int size_t;\n[ ]*\*\/\)/\1\ #ifndef __SIZE_TYPE__\ #define __SIZE_TYPE__ long unsigned int\ @@ -2355,7 +2273,7 @@ typedef __SIZE_TYPE__ size_t;\ # - # Fix 82: Systypes_For_Aix + # Fix 78: Systypes_For_Aix # case "$file" in ./sys/types.h ) if ( test -n "`egrep 'typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t' $file`" -a \ @@ -2383,7 +2301,7 @@ typedef __SIZE_TYPE__ size_t;\ # - # Fix 83: Sysv68_String + # Fix 79: Sysv68_String # case "$file" in ./string.h ) fixlist="${fixlist} @@ -2411,7 +2329,7 @@ extern unsigned int\ # - # Fix 84: Sysz_Stdlib_For_Sun + # Fix 80: Sysz_Stdlib_For_Sun # case "$file" in ./stdlib.h ) case "$target_canonical" in *-sun-* | \ @@ -2445,7 +2363,7 @@ extern unsigned int\ # - # Fix 85: Sysz_Stdtypes_For_Sun + # Fix 81: Sysz_Stdtypes_For_Sun # case "$file" in ./sys/stdtypes.h ) fixlist="${fixlist} @@ -2483,7 +2401,7 @@ extern unsigned int\ # - # Fix 86: Tinfo_Cplusplus + # Fix 82: Tinfo_Cplusplus # case "$file" in ./tinfo.h ) fixlist="${fixlist} @@ -2501,7 +2419,7 @@ extern unsigned int\ # - # Fix 87: Ultrix_Ansi_Compat + # Fix 83: Ultrix_Ansi_Compat # case "$file" in ./ansi_compat.h ) if ( test -n "`egrep 'ULTRIX' $file`" @@ -2525,7 +2443,7 @@ extern unsigned int\ # - # Fix 88: Ultrix_Atof_Param + # Fix 84: Ultrix_Atof_Param # case "$file" in ./math.h ) fixlist="${fixlist} @@ -2547,7 +2465,7 @@ extern unsigned int\ # - # Fix 89: Ultrix_Const + # Fix 85: Ultrix_Const # case "$file" in ./stdio.h ) fixlist="${fixlist} @@ -2573,7 +2491,7 @@ extern unsigned int\ # - # Fix 90: Ultrix_Ifdef + # Fix 86: Ultrix_Ifdef # case "$file" in ./sys/file.h ) if ( test -n "`egrep '#ifdef KERNEL' $file`" @@ -2594,7 +2512,7 @@ extern unsigned int\ # - # Fix 91: Ultrix_Nested_Cmnt + # Fix 87: Ultrix_Nested_Cmnt # case "$file" in ./rpc/svc.h ) fixlist="${fixlist} @@ -2612,7 +2530,7 @@ extern unsigned int\ # - # Fix 92: Ultrix_Static + # Fix 88: Ultrix_Static # case "$file" in ./machine/cpu.h ) if ( test -n "`egrep '#include \"r[34]_cpu' $file`" @@ -2635,7 +2553,7 @@ extern unsigned int\ # - # Fix 93: Undefine_Null + # Fix 89: Undefine_Null # if ( test -n "`egrep '^#[ ]*define[ ]*[ ]NULL[ ]' $file`" -a \ -z "`egrep '#[ ]*(ifn|un)def[ ]*[ ]NULL($|[ ])' $file`" @@ -2656,7 +2574,7 @@ extern unsigned int\ # - # Fix 94: Va_I960_Macro + # Fix 90: Va_I960_Macro # case "$file" in ./arch/i960/archI960.h ) if ( test -n "`egrep '__(vsiz|vali|vpad|alignof__)' $file`" @@ -2680,7 +2598,7 @@ extern unsigned int\ # - # Fix 95: Void_Null + # Fix 91: Void_Null # case "$file" in ./curses.h | \ ./dbm.h | \ @@ -2711,7 +2629,7 @@ extern unsigned int\ # - # Fix 96: Vxworks_Gcc_Problem + # Fix 92: Vxworks_Gcc_Problem # case "$file" in ./types/vxTypesBase.h ) if ( test -n "`egrep '__GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__' $file`" @@ -2753,7 +2671,7 @@ extern unsigned int\ # - # Fix 97: Vxworks_Needs_Vxtypes + # Fix 93: Vxworks_Needs_Vxtypes # case "$file" in ./time.h ) if ( test -n "`egrep 'uint_t[ ][ ]*_clocks_per_sec' $file`" @@ -2774,7 +2692,7 @@ extern unsigned int\ # - # Fix 98: Vxworks_Needs_Vxworks + # Fix 94: Vxworks_Needs_Vxworks # case "$file" in ./sys/stat.h ) if ( test -n "`egrep '#[ ]define[ ][ ]*__INCstath' $file`" -a \ @@ -2800,7 +2718,7 @@ extern unsigned int\ # - # Fix 99: Vxworks_Time + # Fix 95: Vxworks_Time # case "$file" in ./time.h ) if ( test -n "`egrep 'VOIDFUNCPTR' $file`" -a \ @@ -2832,7 +2750,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ # - # Fix 100: X11_Class + # Fix 96: X11_Class # case "$file" in ./X11/ShellP.h ) if ( test -z "`egrep '__cplusplus' $file`" @@ -2860,7 +2778,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ # - # Fix 101: X11_Class_Usage + # Fix 97: X11_Class_Usage # case "$file" in ./Xm/BaseClassI.h ) if ( test -z "`egrep '__cplusplus' $file`" @@ -2881,7 +2799,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ # - # Fix 102: X11_New + # Fix 98: X11_New # case "$file" in ./Xm/Traversal.h ) if ( test -z "`egrep '__cplusplus' $file`" @@ -2910,7 +2828,7 @@ typedef void (*__gcc_VOIDFUNCPTR) ();\ # - # Fix 103: X11_Sprintf + # Fix 99: X11_Sprintf # case "$file" in ./X11*/Xmu.h ) fixlist="${fixlist} @@ -2930,7 +2848,7 @@ extern char * sprintf();\ # - # Fix 104: Zzz_Ki_Iface + # Fix 100: Zzz_Ki_Iface # case "$file" in ./sys/ki_iface.h ) if ( test -n "`egrep 'These definitions are for HP Internal developers' $file`" @@ -2957,7 +2875,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. # - # Fix 105: Zzz_Ki + # Fix 101: Zzz_Ki # case "$file" in ./sys/ki.h ) if ( test -n "`egrep '11.00 HP-UX LP64' $file`" @@ -2984,7 +2902,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. # - # Fix 106: Zzz_Ki_Calls + # Fix 102: Zzz_Ki_Calls # case "$file" in ./sys/ki_calls.h ) if ( test -n "`egrep 'KI_MAX_PROCS is an arbitrary number' $file`" @@ -3011,7 +2929,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. # - # Fix 107: Zzz_Ki_Defs + # Fix 103: Zzz_Ki_Defs # case "$file" in ./sys/ki_defs.h ) if ( test -n "`egrep 'Kernel Instrumentation Definitions' $file`" @@ -3038,7 +2956,7 @@ cat > /dev/null ) < $infile > ${DESTDIR}/$file. # - # Fix 108: Zzz_Time + # Fix 104: Zzz_Time # case "$file" in ./sys/time.h ) if ( test -n "`egrep 'For CASPEC, look in' $file`" |