]> gcc.gnu.org Git - gcc.git/blame - gcc/fixincludes
Edit to add a missing $(exeext) for CCCP.
[gcc.git] / gcc / fixincludes
CommitLineData
c61a25b1
DM
1#! /bin/sh
2# Install modified versions of certain ANSI-incompatible system header files
3# which are fixed to work correctly with ANSI C
4# and placed in a directory that GNU C will search.
5
6# See README-fixinc for more information.
7
8# Directory containing the original header files.
9# (This was named INCLUDES, but that conflicts with a name in Makefile.in.)
10INPUT=${2-${INPUT-/usr/include}}
11
ffc47266
JW
12# Directory in which to store the results.
13LIB=${1?"fixincludes: output directory not specified"}
c61a25b1 14
4ed15f9d
RS
15# Define PWDCMD as a command to use to get the working dir
16# in the form that we want.
17PWDCMD=pwd
18case "`pwd`" in
19//*)
20 # On an Apollo, discard everything before `/usr'.
d45ceebe 21 PWDCMD="eval pwd | sed -e 's,.*/usr/,/usr/,'"
4ed15f9d
RS
22 ;;
23esac
24
631e21eb
DE
25# Original directory.
26ORIGDIR=`${PWDCMD}`
27
c61a25b1
DM
28# Make sure it exists.
29if [ ! -d $LIB ]; then
30 mkdir $LIB || exit 1
31fi
32
e1fa48b5
RS
33# Make LIB absolute only if needed to avoid problems with the amd.
34case $LIB in
35/*)
36 ;;
37*)
38 cd $LIB; LIB=`${PWDCMD}`
39 ;;
40esac
c61a25b1
DM
41
42# Fail if no arg to specify a directory for the output.
43if [ x$1 = x ]
44then echo fixincludes: no output directory specified
45exit 1
46fi
47
1ac7d389 48echo Building fixed headers in ${LIB}
c61a25b1
DM
49
50# Determine whether this system has symbolic links.
51if ln -s X $LIB/ShouldNotExist 2>/dev/null; then
52 rm -f $LIB/ShouldNotExist
0fa2faf0
RS
53 LINKS=true
54elif ln -s X /tmp/ShouldNotExist 2>/dev/null; then
55 rm -f /tmp/ShouldNotExist
c61a25b1
DM
56 LINKS=true
57else
58 LINKS=false
59fi
60
1ac7d389 61echo Finding directories and links to directories
c61a25b1 62cd ${INPUT}
3308e40a 63# Find all directories and all symlinks that point to directories.
f1f1ae8e
RS
64# Put the list in $files.
65# Each time we find a symlink, add it to newdirs
66# so that we do another find within the dir the link points to.
67# Note that $files may have duplicates in it;
68# later parts of this file are supposed to ignore them.
69dirs="."
fd297e33
RS
70levels=2
71while [ -n "$dirs" ] && [ $levels -gt 0 ]
f1f1ae8e 72do
fd297e33 73 levels=`expr $levels - 1`
f1f1ae8e 74 newdirs=
fd297e33 75 for d in $dirs
f1f1ae8e 76 do
1ac7d389 77 echo " Searching $INPUT/$d"
f1f1ae8e
RS
78 if [ "$d" != . ]
79 then
80 d=$d/.
81 fi
82
fd297e33 83 # Find all directories under $d, relative to $d, excluding $d itself.
165b3941
RS
84 files="$files `find $d -type d -print | \
85 sed -e '/\/\.$/d' -e '/^\.$/d'`"
86 # Find all links to directories.
87 # Using `-exec test -d' in find fails on some systems,
88 # and trying to run test via sh fails on others,
89 # so this is the simplest alternative left.
90 # First find all the links, then test each one.
91 theselinks=
f1f1ae8e 92 $LINKS && \
165b3941
RS
93 theselinks=`find $d -type l -print`
94 for d1 in $theselinks --dummy--
95 do
1ac7d389
RS
96 # If the link points to a directory,
97 # add that dir to $newdirs
165b3941
RS
98 if [ -d $d1 ]
99 then
d6228809
ILT
100 files="$files $d1"
101 if [ "`ls -ld $d1 | sed -n 's/.*-> //p'`" != "." ]
102 then
103 newdirs="$newdirs $d1"
104 fi
165b3941
RS
105 fi
106 done
f1f1ae8e
RS
107 done
108
109 dirs="$newdirs"
f1f1ae8e
RS
110done
111
112dirs=
1ac7d389 113echo "All directories (including links to directories):"
f1f1ae8e
RS
114echo $files
115
c61a25b1
DM
116for file in $files; do
117 rm -rf $LIB/$file
118 if [ ! -d $LIB/$file ]
119 then mkdir $LIB/$file
120 fi
121done
1ac7d389 122mkdir $LIB/root
c61a25b1
DM
123
124# treetops gets an alternating list
125# of old directories to copy
126# and the new directories to copy to.
127treetops="${INPUT} ${LIB}"
128
129if $LINKS; then
1ac7d389 130 echo 'Making symbolic directory links'
c61a25b1
DM
131 for file in $files; do
132 dest=`ls -ld $file | sed -n 's/.*-> //p'`
133 if [ "$dest" ]; then
4ed15f9d 134 cwd=`${PWDCMD}`
c61a25b1
DM
135 # In case $dest is relative, get to $file's dir first.
136 cd ${INPUT}
137 cd `echo ./$file | sed -n 's&[^/]*$&&p'`
138 # Check that the target directory exists.
139 # Redirections changed to avoid bug in sh on Ultrix.
140 (cd $dest) > /dev/null 2>&1
141 if [ $? = 0 ]; then
142 cd $dest
143 # X gets the dir that the link actually leads to.
4ed15f9d 144 x=`${PWDCMD}`
17c96289
ILT
145 # Canonicalize ${INPUT} now to minimize the time an
146 # automounter has to change the result of ${PWDCMD}.
147 cinput=`cd ${INPUT}; ${PWDCMD}`
1ac7d389 148 # If a link points to ., make a similar link to .
17c96289 149 if [ $x = ${cinput} ]; then
1ac7d389
RS
150 echo $file '->' . ': Making link'
151 rm -fr ${LIB}/$file > /dev/null 2>&1
152 ln -s . ${LIB}/$file > /dev/null 2>&1
c61a25b1
DM
153 # If link leads back into ${INPUT},
154 # make a similar link here.
17c96289 155 elif expr $x : "${cinput}/.*" > /dev/null; then
c61a25b1 156 # Y gets the actual target dir name, relative to ${INPUT}.
17c96289 157 y=`echo $x | sed -n "s&${cinput}/&&p"`
884caf18
PE
158 # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
159 dots=`echo "$file" |
e5c1a9d2 160 sed -e 's@^./@@' -e 's@/./@/@g' -e 's@[^/][^/]*@..@g' -e 's@..$@@'`
884caf18 161 echo $file '->' $dots$y ': Making link'
c61a25b1 162 rm -fr ${LIB}/$file > /dev/null 2>&1
884caf18 163 ln -s $dots$y ${LIB}/$file > /dev/null 2>&1
c61a25b1 164 else
1ac7d389
RS
165 # If the link is to a dir $target outside ${INPUT},
166 # repoint the link at ${INPUT}/root$target
167 # and process $target into ${INPUT}/root$target
c61a25b1 168 # treat this directory as if it actually contained the files.
1ac7d389
RS
169 echo $file '->' root$x ': Making link'
170 if [ -d $LIB/root$x ]
171 then true
172 else
173 dirname=root$x/
174 dirmade=.
175 cd $LIB
176 while [ x$dirname != x ]; do
177 component=`echo $dirname | sed -e 's|/.*$||'`
178 mkdir $component >/dev/null 2>&1
179 cd $component
180 dirmade=$dirmade/$component
181 dirname=`echo $dirname | sed -e 's|[^/]*/||'`
182 done
183 fi
f744b2ce
RS
184 # Duplicate directory structure created in ${LIB}/$file in new
185 # root area.
186 for file2 in $files; do
187 case $file2 in
638fa106 188 $file/./*)
f744b2ce
RS
189 dupdir=${LIB}/root$x/`echo $file2 | sed -n "s|^${file}/||p"`
190 echo "Duplicating ${file}'s ${dupdir}"
191 if [ -d ${dupdir} ]
192 then true
193 else
194 mkdir ${dupdir}
195 fi
196 ;;
638fa106
BK
197 *)
198 ;;
f744b2ce
RS
199 esac
200 done
3221f176
ILT
201 # Get the path from ${LIB} to $file, accounting for symlinks.
202 parent=`echo "$file" | sed -e 's@/[^/]*$@@'`
203 libabs=`cd ${LIB}; ${PWDCMD}`
204 file2=`cd ${LIB}; cd $parent; ${PWDCMD} | sed -e "s@^${libabs}@@"`
884caf18 205 # DOTS is the relative path from ${LIB}/$file's dir back to ${LIB}.
3221f176 206 dots=`echo "$file2" | sed -e 's@/[^/]*@../@g'`
1ac7d389 207 rm -fr ${LIB}/$file > /dev/null 2>&1
884caf18 208 ln -s ${dots}root$x ${LIB}/$file > /dev/null 2>&1
1ac7d389 209 treetops="$treetops $x ${LIB}/root$x"
c61a25b1
DM
210 fi
211 fi
212 cd $cwd
213 fi
214 done
215fi
216
40f1c86c 217required=
25e51a69
ILT
218set x $treetops
219shift
c61a25b1
DM
220while [ $# != 0 ]; do
221 # $1 is an old directory to copy, and $2 is the new directory to copy to.
c61a25b1
DM
222 cd ${INPUT}
223 cd $1
1ac7d389
RS
224# The same dir can appear more than once in treetops.
225# There's no need to scan it more than once.
226 if [ -f $2/DONE ]
227 then
228 files=
229 else
230 touch $2/DONE
231 echo Fixing directory $1 into $2
8c31e6b6
RS
232# Check .h files which are symlinks as well as those which are files.
233# A link to a header file will not be processed by anything but this.
73bdfabc
RS
234 if $LINKS; then
235 files=`find . -name '*.h' \( -type f -o -type l \) -print`
236 else
237 files=`find . -name '*.h' -type f -print`
238 fi
1ac7d389
RS
239 echo Checking header files
240 fi
c61a25b1
DM
241# Note that BSD43_* are used on recent MIPS systems.
242 for file in $files; do
243# This call to egrep is essential, since checking a file with egrep
244# is much faster than actually trying to fix it.
3308e40a
RS
245# It is also essential that most files *not* match!
246# Thus, matching every #endif is unacceptable.
c61a25b1
DM
247# But the argument to egrep must be kept small, or many versions of egrep
248# won't be able to handle it.
25e51a69
ILT
249#
250# We use the pattern [!-.0-~] instead of [^/ ] to match a noncomment
251# following #else or #endif because some buggy egreps think [^/] matches
252# newline, and they thus think `#else ' matches `#e[ndiflse]*[ ]+[^/ ]'.
253#
254# We use the pattern [^a-zA-Z0-9_][_a-ce-km-z][a-z0-9] to match an identifier
255# following #if or #elif that is not surrounded by __. The `a-ce-km-z'
256# in this pattern lacks `d' and `l'; this means we don't worry about
257# identifiers starting with `d' or `l'. This is OK, since none of the
258# identifiers below start with `d' or `l'. It also greatly improves
259# performance, since many files contain lines of the form `#if ... defined ...'
260# or `#if lint'.
a6642da8 261 if egrep '//|[ _]_IO|CTRL|^#define.NULL|^#e[nl][ds][ief]*[ ]+[!-.0-~]|^#[el]*if.*[^a-zA-Z0-9_][_a-ce-km-zA-Z][a-zA-Z0-9]' $file >/dev/null; then
c61a25b1
DM
262 if [ -r $file ]; then
263 cp $file $2/$file >/dev/null 2>&1 \
264 || echo "Can't copy $file"
265 chmod +w $2/$file
2e4cd151 266 chmod a+r $2/$file
8caf703c
RS
267 # Here is how the sed commands in braces work.
268 # (It doesn't work to put the comments inside the sed commands.)
269 # Surround each word with spaces, to simplify matching below.
270 # ANSIfy each pre-ANSI machine-dependent symbol
271 # by surrounding it with __ __.
272 # Remove the spaces that we inserted around each word.
c61a25b1
DM
273 sed -e '
274 :loop
275 /\\$/ N
276 /\\$/ b loop
20c74d5e
PE
277 s%^\([ ]*#[ ]*else\)[ ]*/[^*].*%\1%
278 s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%
279 s%^\([ ]*#[ ]*endif\)[ ]*/[^*].*%\1%
ec4738c0
RS
280 s%^\([ ]*#[ ]*endif\)[ ]*\*[^/].*%\1%
281 s%^\([ ]*#[ ]*endif\)[ ]*[^/* ].*%\1%
883bc780 282 /\/\/[^*]/ s|//\(.*\)$|/*\1*/|
2a46424a 283 /[ ]_IO[A-Z]*[ ]*(/ s/\(_IO[A-Z]*[ ]*(\)\(.\),/\1'\''\2'\'',/
c61a25b1 284 /[ ]BSD43__IO[A-Z]*[ ]*(/ s/(\(.\),/('\''\1'\'',/
8bfed528 285 /#define._IO/ s/'\''\([cgxtf]\)'\''/\1/g
25e51a69 286 /#define.BSD43__IO/ s/'\''\([cgx]\)'\''/\1/g
d7c768e7
RS
287 /[^A-Z0-9_]CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/
288 /[^A-Z0-9]_CTRL[ ]*(/ s/\([^'\'']\))/'\''\1'\'')/
621b3771
RS
289 /#define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g
290 /#define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g
a2790172 291 /#define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g
d4df2ea5 292 /#[ ]*[el]*if/{
25e51a69
ILT
293 s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g
294
25e51a69 295 s/ bsd4\([0-9]\) / __bsd4\1__ /g
a6642da8 296 s/ _*host_mips / __host_mips__ /g
25e51a69 297 s/ _*i386 / __i386__ /g
984da0ff 298 s/ M32 / __M32__ /g
25e51a69
ILT
299 s/ is68k / __is68k__ /g
300 s/ m68k / __m68k__ /g
301 s/ mc680\([0-9]\)0 / __mc680\10__ /g
984da0ff 302 s/ m88k / __m88k__ /g
a6642da8 303 s/ _*mips / __mips__ /g
25e51a69
ILT
304 s/ news\([0-9]*\) / __news\1__ /g
305 s/ ns32000 / __ns32000__ /g
984da0ff 306 s/ pdp11 / __pdp11__ /g
25e51a69 307 s/ pyr / __pyr__ /g
863415d1 308 s/ sel / __sel__ /g
25e51a69
ILT
309 s/ sony_news / __sony_news__ /g
310 s/ sparc / __sparc__ /g
311 s/ sun\([a-z0-9]*\) / __sun\1__ /g
863415d1 312 s/ tahoe / __tahoe__ /g
984da0ff
ILT
313 s/ tower\([_0-9]*\) / __tower\1__ /g
314 s/ u370 / __u370__ /g
315 s/ u3b\([0-9]*\) / __u3b\1__ /g
25e51a69
ILT
316 s/ unix / __unix__ /g
317 s/ vax / __vax__ /g
a6642da8 318 s/ _*MIPSE\([LB]\) / __MIPSE\1__ /g
863415d1 319 s/ _*\([Rr][34]\)000 / __\1000__ /g
a6642da8 320 s/ _*SYSTYPE_\([A-Z0-9]*\) / __SYSTYPE_\1__ /g
25e51a69 321
25e51a69
ILT
322 s/ \([a-zA-Z0-9_][a-zA-Z0-9_]*\) /\1/g
323 }
45b33951 324 /^#define.NULL[ ]/ i\
c61a25b1 325 #undef NULL
78c5c646
RS
326 ' $2/$file > $2/$file.
327 mv $2/$file. $2/$file
29421402
ILT
328 if cmp $file $2/$file >/dev/null 2>&1 \
329 || egrep 'This file is part of the GNU C Library' $2/$file >/dev/null 2>&1; then
c61a25b1 330 rm $2/$file
b52a4b72
RS
331 else
332 echo Fixed $file
40f1c86c
RS
333 # Find any include directives that use "file".
334 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' $2/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
335 dir=`echo $file | sed -e s'|/[^/]*$||'`
336 required="$required $1 $dir/$include $2/$dir/$include"
337 done
c61a25b1
DM
338 fi
339 fi
340 fi
341 done
342 shift; shift
343done
344
345cd ${INPUT}
346
6c8ceeae
JM
347# Install the proper definition of the three standard types in header files
348# that they come from.
a6642da8 349for file in sys/types.h stdlib.h sys/stdtypes.h stddef.h memory.h unistd.h; do
cd3383a3
RS
350 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
351 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
352 chmod +w ${LIB}/$file 2>/dev/null
353 chmod a+r ${LIB}/$file 2>/dev/null
354 fi
355
356 if [ -r ${LIB}/$file ]; then
6c8ceeae
JM
357 echo Fixing size_t, ptrdiff_t and wchar_t in $file
358 sed \
359 -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/i\
224b1df0
ILT
360#ifndef __SIZE_TYPE__\
361#define __SIZE_TYPE__ long unsigned int\
d4c60bd6
ILT
362#endif
363' \
6c8ceeae
JM
364 -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/typedef __SIZE_TYPE__ size_t/' \
365 -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]ptrdiff_t/i\
366#ifndef __PTRDIFF_TYPE__\
367#define __PTRDIFF_TYPE__ long int\
368#endif
369' \
370 -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]ptrdiff_t/typedef __PTRDIFF_TYPE__ ptrdiff_t/' \
371 -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/i\
372#ifndef __WCHAR_TYPE__\
373#define __WCHAR_TYPE__ int\
99934aed
RK
374#endif\
375#ifndef __cplusplus
376' \
377 -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/a\
6c8ceeae
JM
378#endif
379' \
380 -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]wchar_t/typedef __WCHAR_TYPE__ wchar_t/' \
381 ${LIB}/$file > ${LIB}/${file}.sed
cd3383a3
RS
382 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
383 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
384 rm ${LIB}/$file
7a0934e7
ILT
385 else
386 # Find any include directives that use "file".
387 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
388 dir=`echo $file | sed -e s'|/[^/]*$||'`
389 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
390 done
cd3383a3
RS
391 fi
392 fi
393done
394
c61a25b1
DM
395# Fix one other error in this file: a mismatched quote not inside a C comment.
396file=sundev/vuid_event.h
397if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
398 mkdir ${LIB}/sundev 2>/dev/null
399 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
400 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 401 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
402fi
403
404if [ -r ${LIB}/$file ]; then
405 echo Fixing $file comment
ffc47266
JW
406 sed -e "s/doesn't/does not/" ${LIB}/$file > ${LIB}/${file}.sed
407 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 408 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 409 rm ${LIB}/$file
7a0934e7
ILT
410 else
411 # Find any include directives that use "file".
412 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
413 dir=`echo $file | sed -e s'|/[^/]*$||'`
414 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
415 done
c61a25b1
DM
416 fi
417fi
418
4ba0ff2d
JW
419# Fix these Sun OS files to avoid an invalid identifier in an #ifdef.
420file=sunwindow/win_cursor.h
421if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
422# mkdir ${LIB}/sunwindow 2>/dev/null
423 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
424 chmod +w ${LIB}/$file 2>/dev/null
425fi
426if [ -r ${LIB}/$file ]; then
427 echo Fixing $file
428 sed -e "s/ecd.cursor/ecd_cursor/" ${LIB}/$file > ${LIB}/${file}.sed
429 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
430 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
431 rm ${LIB}/$file
7a0934e7
ILT
432 else
433 # Find any include directives that use "file".
434 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
435 dir=`echo $file | sed -e s'|/[^/]*$||'`
436 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
437 done
4ba0ff2d
JW
438 fi
439fi
440file=sunwindow/win_lock.h
441if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
442# mkdir ${LIB}/sunwindow 2>/dev/null
443 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
444 chmod +w ${LIB}/$file 2>/dev/null
445fi
446if [ -r ${LIB}/$file ]; then
447 echo Fixing $file
448 sed -e "s/ecd.cursor/ecd_cursor/" ${LIB}/$file > ${LIB}/${file}.sed
449 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
450 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
451 rm ${LIB}/$file
7a0934e7
ILT
452 else
453 # Find any include directives that use "file".
454 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
455 dir=`echo $file | sed -e s'|/[^/]*$||'`
456 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
457 done
4ba0ff2d
JW
458 fi
459fi
460
6dc42e49 461# Fix this Sun file to avoid interfering with stddef.h.
c61a25b1
DM
462file=sys/stdtypes.h
463if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
464 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
465 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 466 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
467fi
468
469if [ -r ${LIB}/$file ]; then
470 echo Fixing $file
daa4489f 471sed -e '/[ ]size_t.*;/i\
ffc47266 472#ifndef _GCC_SIZE_T\
d4c60bd6
ILT
473#define _GCC_SIZE_T
474' \
daa4489f 475 -e '/[ ]size_t.*;/a\
d4c60bd6
ILT
476#endif
477' \
daa4489f 478 -e '/[ ]ptrdiff_t.*;/i\
ffc47266 479#ifndef _GCC_PTRDIFF_T\
d4c60bd6
ILT
480#define _GCC_PTRDIFF_T
481' \
daa4489f 482 -e '/[ ]ptrdiff_t.*;/a\
d4c60bd6
ILT
483#endif
484' \
daa4489f 485 -e '/[ ]wchar_t.*;/i\
ffc47266 486#ifndef _GCC_WCHAR_T\
d4c60bd6
ILT
487#define _GCC_WCHAR_T
488' \
daa4489f 489 -e '/[ ]wchar_t.*;/a\
d4c60bd6
ILT
490#endif
491' ${LIB}/$file > ${LIB}/${file}.sed
ffc47266 492 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
87394941
ILT
493 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
494 rm ${LIB}/$file
7a0934e7
ILT
495 else
496 # Find any include directives that use "file".
497 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
498 dir=`echo $file | sed -e s'|/[^/]*$||'`
499 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
500 done
87394941
ILT
501 fi
502fi
503
504# Fix this ARM/RISCiX file to avoid interfering with the use of __wchar_t
505# in cc1plus.
506file=stdlib.h
507if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
508 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
509 chmod +w ${LIB}/$file 2>/dev/null
510 chmod a+r ${LIB}/$file 2>/dev/null
511fi
512
513if [ -r ${LIB}/$file ]; then
514 echo Fixing $file
19571479
RS
515 sed -e "s/\(#[ ]*ifndef[ ]*\)__wchar_t/\1_GCC_WCHAR_T/" \
516 -e "s/\(#[ ]*define[ ]*\)__wchar_t/\1_GCC_WCHAR_T/" \
87394941
ILT
517 ${LIB}/$file > ${LIB}/${file}.sed
518 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 519 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 520 rm ${LIB}/$file
7a0934e7
ILT
521 else
522 # Find any include directives that use "file".
523 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
524 dir=`echo $file | sed -e s'|/[^/]*$||'`
525 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
526 done
527 fi
528fi
529
530# Fix this ARM/RISCiX file where ___type is a Compiler hint that is specific to
531# the Norcroft compiler.
532file=X11/Intrinsic.h
533if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
534 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
535 chmod +w ${LIB}/$file 2>/dev/null
536 chmod a+r ${LIB}/$file 2>/dev/null
537fi
538
539if [ -r ${LIB}/$file ]; then
540 echo Fixing $file
541 sed -e "s/___type p_type/p_type/" \
542 ${LIB}/$file > ${LIB}/${file}.sed
543 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
544 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
545 rm ${LIB}/$file
546 else
547 # Find any include directives that use "file".
548 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
549 dir=`echo $file | sed -e s'|/[^/]*$||'`
550 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
551 done
c61a25b1
DM
552 fi
553fi
554
fd9287ae 555# Fix this file to avoid interfering with stddef.h, but don't mistakenly
a6e9783c
JW
556# match ssize_t present in AIX for the ps/2, or typedefs which use (but do not
557# set) size_t.
c61a25b1
DM
558file=sys/types.h
559if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
560 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
561 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 562 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
563fi
564
565if [ -r ${LIB}/$file ]; then
566 echo Fixing $file
b7bb5c98 567sed -e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/i\
ffc47266 568#ifndef _GCC_SIZE_T\
d4c60bd6
ILT
569#define _GCC_SIZE_T
570' \
b7bb5c98 571 -e '/typedef[ ][ ]*[A-Za-z_][ A-Za-z_]*[ ]size_t/a\
d4c60bd6
ILT
572#endif
573' ${LIB}/$file > ${LIB}/${file}.sed
ffc47266 574 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 575 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 576 rm ${LIB}/$file
7a0934e7
ILT
577 else
578 # Find any include directives that use "file".
579 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
580 dir=`echo $file | sed -e s'|/[^/]*$||'`
581 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
582 done
c61a25b1
DM
583 fi
584fi
585
94e21bd7
DE
586# Fix HP's use of ../machine/inline.h to refer to
587# /usr/include/machine/inline.h
588file=sys/spinlock.h
e03bb072 589if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
94e21bd7
DE
590 cp $file ${LIB}/$file
591fi
592if [ -r ${LIB}/$file ] ; then
593 echo Fixing $file
594 sed -e 's,"../machine/inline.h",<machine/inline.h>,' \
595 -e 's,"../machine/psl.h",<machine/psl.h>,' \
596 ${LIB}/$file > ${LIB}/${file}.sed
597 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
598 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
599 rm ${LIB}/$file
7a0934e7
ILT
600 else
601 # Find any include directives that use "file".
602 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
603 dir=`echo $file | sed -e s'|/[^/]*$||'`
604 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
605 done
94e21bd7
DE
606 fi
607fi
608
08455880
TW
609# Fix an error in this file: the #if says _cplusplus, not the double
610# underscore __cplusplus that it should be
611file=tinfo.h
612if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
613 mkdir ${LIB}/rpcsvc 2>/dev/null
614 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
615 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 616 chmod a+r ${LIB}/$file 2>/dev/null
08455880
TW
617fi
618
619if [ -r ${LIB}/$file ]; then
620 echo Fixing $file, __cplusplus macro
621 sed -e 's/[ ]_cplusplus/ __cplusplus/' ${LIB}/$file > ${LIB}/${file}.sed
622 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
623 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
624 rm ${LIB}/$file
7a0934e7
ILT
625 else
626 # Find any include directives that use "file".
627 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
628 dir=`echo $file | sed -e s'|/[^/]*$||'`
629 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
630 done
08455880
TW
631 fi
632fi
633
c61a25b1
DM
634# Fix an error in this file: a missing semi-colon at the end of the statsswtch
635# structure definition.
636file=rpcsvc/rstat.h
637if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
638 mkdir ${LIB}/rpcsvc 2>/dev/null
639 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
640 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 641 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
642fi
643
644if [ -r ${LIB}/$file ]; then
645 echo Fixing $file, definition of statsswtch
ffc47266
JW
646 sed -e 's/boottime$/boottime;/' ${LIB}/$file > ${LIB}/${file}.sed
647 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 648 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 649 rm ${LIB}/$file
7a0934e7
ILT
650 else
651 # Find any include directives that use "file".
652 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
653 dir=`echo $file | sed -e s'|/[^/]*$||'`
654 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
655 done
c61a25b1
DM
656 fi
657fi
658
659# Fix an error in this file: a missing semi-colon at the end of the nodeent
660# structure definition.
661file=netdnet/dnetdb.h
662if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
663 mkdir ${LIB}/netdnet 2>/dev/null
664 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
665 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 666 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
667fi
668
669if [ -r ${LIB}/$file ]; then
670 echo Fixing $file, definition of nodeent
ffc47266
JW
671 sed -e 's/char.*na_addr *$/char *na_addr;/' ${LIB}/$file > ${LIB}/${file}.sed
672 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 673 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 674 rm ${LIB}/$file
7a0934e7
ILT
675 else
676 # Find any include directives that use "file".
677 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
678 dir=`echo $file | sed -e s'|/[^/]*$||'`
679 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
680 done
c61a25b1
DM
681 fi
682fi
683
684# Check for bad #ifdef line (in Ultrix 4.1)
685file=sys/file.h
686if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
687 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
688 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 689 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
690fi
691
692if [ -r ${LIB}/$file ]; then
693 echo Fixing $file, bad \#ifdef line
ffc47266
JW
694 sed -e 's/#ifdef KERNEL/#if defined(KERNEL)/' ${LIB}/$file > ${LIB}/${file}.sed
695 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 696 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 697 rm ${LIB}/$file
7a0934e7
ILT
698 else
699 # Find any include directives that use "file".
700 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
701 dir=`echo $file | sed -e s'|/[^/]*$||'`
702 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
703 done
c61a25b1
DM
704 fi
705fi
706
707# Check for superfluous `static' (in Ultrix 4.2)
46eeda17 708# On Ultrix 4.3, includes of other files (r3_cpu.h,r4_cpu.h) is broken.
c61a25b1
DM
709file=machine/cpu.h
710if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
711 mkdir ${LIB}/machine 2>/dev/null
712 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
713 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 714 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
715fi
716
717if [ -r ${LIB}/$file ]; then
46eeda17
DE
718 echo Fixing $file, superfluous static and broken includes of other files.
719 sed -e 's/^static struct tlb_pid_state/struct tlb_pid_state/' \
720 -e 's/^#include "r3_cpu\.h"$/#include <machine\/r3_cpu\.h>/' \
721 -e 's/^#include "r4_cpu\.h"$/#include <machine\/r4_cpu\.h>/' \
722 ${LIB}/$file > ${LIB}/${file}.sed
ffc47266 723 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 724 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1
DM
725 rm ${LIB}/$file
726 else
7a0934e7
ILT
727 # Find any include directives that use "file".
728 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
729 dir=`echo $file | sed -e s'|/[^/]*$||'`
730 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
731 done
c61a25b1 732# This file has an alternative name, mips/cpu.h. Fix that name, too.
1f1ff018 733 if cmp machine/cpu.h mips/cpu.h > /dev/null 2>&1; then
c61a25b1 734 mkdir ${LIB}/mips 2>&-
46eeda17
DE
735# Don't remove the file first, they may be the same file!
736 ln ${LIB}/$file ${LIB}/mips/cpu.h > /dev/null 2>&1
c61a25b1
DM
737 fi
738 fi
739fi
740
75251fe0 741# Incorrect sprintf declaration in X11/Xmu.h
c61a25b1
DM
742file=X11/Xmu.h
743if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
744 mkdir ${LIB}/X11 2>/dev/null
745 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
746 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 747 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
748fi
749
750if [ -r ${LIB}/$file ]; then
751 echo Fixing $file sprintf declaration
ffc47266
JW
752 sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\
753extern char * sprintf();\
8739838d 754#endif /* !defined __STDC__ */,' ${LIB}/$file > ${LIB}/${file}.sed
ffc47266 755 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
c61a25b1 756 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 757 rm ${LIB}/$file
7a0934e7
ILT
758 else
759 # Find any include directives that use "file".
760 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
761 dir=`echo $file | sed -e s'|/[^/]*$||'`
762 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
763 done
c61a25b1
DM
764 fi
765fi
766
3a6aca8e
RS
767# Incorrect sprintf declaration in X11/Xmu/Xmu.h
768# (It's not clear whether the right file name is this or X11/Xmu.h.)
769file=X11/Xmu/Xmu.h
770if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
771 mkdir ${LIB}/X11/Xmu 2>/dev/null
772 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
773 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 774 chmod a+r ${LIB}/$file 2>/dev/null
3a6aca8e
RS
775fi
776
777if [ -r ${LIB}/$file ]; then
778 echo Fixing $file sprintf declaration
ffc47266
JW
779 sed -e 's,^extern char \* sprintf();$,#ifndef __STDC__\
780extern char * sprintf();\
8739838d 781#endif /* !defined __STDC__ */,' ${LIB}/$file > ${LIB}/${file}.sed
ffc47266 782 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
3a6aca8e 783 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
3a6aca8e 784 rm ${LIB}/$file
7a0934e7
ILT
785 else
786 # Find any include directives that use "file".
787 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
788 dir=`echo $file | sed -e s'|/[^/]*$||'`
789 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
790 done
3a6aca8e
RS
791 fi
792fi
793
c61a25b1
DM
794# Check for missing ';' in struct
795file=netinet/ip.h
796if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
797 mkdir ${LIB}/netinet 2>/dev/null
798 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
799 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 800 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
801fi
802
803if [ -r ${LIB}/$file ]; then
804 echo Fixing $file
805 sed -e '/^struct/,/^};/s/}$/};/' ${LIB}/$file > ${LIB}/${file}.sed
806 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
807 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 808 rm -f ${LIB}/$file
7a0934e7
ILT
809 else
810 # Find any include directives that use "file".
811 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
812 dir=`echo $file | sed -e s'|/[^/]*$||'`
813 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
814 done
c61a25b1
DM
815 fi
816fi
817
75251fe0 818# Fix the CAT macro in SunOS memvar.h.
c61a25b1
DM
819file=pixrect/memvar.h
820if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
821 mkdir ${LIB}/pixrect 2>/dev/null
822 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
823 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 824 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
825fi
826
827if [ -r ${LIB}/$file ]; then
828 echo Fixing $file
829 sed -e '/^#define.CAT(a,b)/ i\
830#ifdef __STDC__ \
831#define CAT(a,b) a##b\
832#else
833/^#define.CAT(a,b)/ a\
834#endif
835' ${LIB}/$file > ${LIB}/${file}.sed
836 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
837 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 838 rm -f ${LIB}/$file
7a0934e7
ILT
839 else
840 # Find any include directives that use "file".
841 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
842 dir=`echo $file | sed -e s'|/[^/]*$||'`
843 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
844 done
c61a25b1
DM
845 fi
846fi
847
848# Check for yet more missing ';' in struct (in SunOS 4.0.x)
849file=rpcsvc/rusers.h
850if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
851 mkdir ${LIB}/rpcsvc 2>/dev/null
852 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
853 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 854 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
855fi
856
857if [ -r ${LIB}/$file ]; then
858 echo Fixing $file
859 sed -e '/^struct/,/^};/s/_cnt$/_cnt;/' ${LIB}/$file > ${LIB}/${file}.sed
860 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
861 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 862 rm -f ${LIB}/$file
7a0934e7
ILT
863 else
864 # Find any include directives that use "file".
865 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
866 dir=`echo $file | sed -e s'|/[^/]*$||'`
867 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
868 done
c61a25b1
DM
869 fi
870fi
871
872# Fix return type of exit and abort in <stdlib.h> on SunOS 4.1.
c87e58bb 873# Also wrap protection around size_t for m88k-sysv3 systems.
c61a25b1
DM
874file=stdlib.h
875if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
876 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
877 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 878 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
879fi
880
881if [ -r ${LIB}/$file ]; then
882 echo Fixing $file
883 sed -e 's/int abort/void abort/g' \
25f75d8a
RS
884 -e 's/int free/void free/g' \
885 -e 's/char \* calloc/void \* calloc/g' \
886 -e 's/char \* malloc/void \* malloc/g' \
887 -e 's/char \* realloc/void \* realloc/g' \
c87e58bb 888 -e 's/int exit/void exit/g' \
a3f6caa7 889 -e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/i\
c87e58bb 890#ifndef _GCC_SIZE_T\
d4c60bd6
ILT
891#define _GCC_SIZE_T
892' \
a3f6caa7 893 -e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/a\
d4c60bd6
ILT
894#endif
895' \
c87e58bb 896 ${LIB}/$file > ${LIB}/${file}.sed
c61a25b1
DM
897 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
898 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 899 rm -f ${LIB}/$file
7a0934e7
ILT
900 else
901 # Find any include directives that use "file".
902 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
903 dir=`echo $file | sed -e s'|/[^/]*$||'`
904 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
905 done
c61a25b1
DM
906 fi
907fi
908
460d7c18
TG
909# Fix return type of free and {c,m,re}alloc in <malloc.h> on SunOS 4.1.
910file=malloc.h
911if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
912 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
913 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 914 chmod a+r ${LIB}/$file 2>/dev/null
460d7c18
TG
915fi
916
917if [ -r ${LIB}/$file ]; then
918 echo Fixing $file
350027ec 919 sed -e 's/typedef[ ]char \* malloc_t/typedef void \* malloc_t/g' \
12fe670b 920 -e 's/int[ ][ ]*free/void free/g' \
460d7c18
TG
921 ${LIB}/$file > ${LIB}/${file}.sed
922 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
923 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
460d7c18 924 rm -f ${LIB}/$file
7a0934e7
ILT
925 else
926 # Find any include directives that use "file".
927 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
928 dir=`echo $file | sed -e s'|/[^/]*$||'`
929 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
930 done
460d7c18
TG
931 fi
932fi
933
c61a25b1
DM
934# Fix bogus #ifdef in <hsfs/hsfs_spec.h> on SunOS 4.1.
935file=hsfs/hsfs_spec.h
936if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
937 mkdir ${LIB}/hsfs 2>/dev/null
938 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
939 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 940 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
941fi
942
943if [ -r ${LIB}/$file ]; then
944 echo Fixing $file
945 sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
78c5c646
RS
946 ${LIB}/$file > ${LIB}/${file}.
947 rm -f ${LIB}/$file; mv ${LIB}/${file}. ${LIB}/$file
c61a25b1 948 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 949 rm -f ${LIB}/$file
7a0934e7
ILT
950 else
951 # Find any include directives that use "file".
952 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
953 dir=`echo $file | sed -e s'|/[^/]*$||'`
954 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
955 done
c61a25b1
DM
956 fi
957fi
958
959# Fix bogus #ifdef in <hsfs/hsnode.h> on SunOS 4.1.
960file=hsfs/hsnode.h
961if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
962 mkdir ${LIB}/hsfs 2>/dev/null
963 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
964 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 965 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
966fi
967
968if [ -r ${LIB}/$file ]; then
969 echo Fixing $file
970 sed -e 's/\#ifdef __i386__ || __sun4c__/\#if __i386__ || __sun4c__/g' \
971 ${LIB}/$file > ${LIB}/${file}.sed
972 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
973 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 974 rm -f ${LIB}/$file
7a0934e7
ILT
975 else
976 # Find any include directives that use "file".
977 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
978 dir=`echo $file | sed -e s'|/[^/]*$||'`
979 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
980 done
c61a25b1
DM
981 fi
982fi
983
984# Fix bogus #ifdef in <hsfs/iso_spec.h> on SunOS 4.1.
985file=hsfs/iso_spec.h
986if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
987 mkdir ${LIB}/hsfs 2>/dev/null
988 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
989 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 990 chmod a+r ${LIB}/$file 2>/dev/null
c61a25b1
DM
991fi
992
993if [ -r ${LIB}/$file ]; then
994 echo Fixing $file
995 sed -e 's/\#ifdef __i386__ || __vax__/\#if __i386__ || __vax__/g' \
996 ${LIB}/$file > ${LIB}/${file}.sed
997 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
998 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
c61a25b1 999 rm -f ${LIB}/$file
7a0934e7
ILT
1000 else
1001 # Find any include directives that use "file".
1002 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1003 dir=`echo $file | sed -e s'|/[^/]*$||'`
1004 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1005 done
c61a25b1
DM
1006 fi
1007fi
1008
75251fe0
DM
1009# Incorrect #include in Sony News-OS 3.2.
1010file=machine/machparam.h
1011if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1012 mkdir ${LIB}/machine 2>/dev/null
1013 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1014 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1015 chmod a+r ${LIB}/$file 2>/dev/null
75251fe0
DM
1016fi
1017
1018if [ -r ${LIB}/$file ]; then
1019 echo Fixing $file, incorrect \#include
1020 sed -e 's@"../machine/endian.h"@<machine/endian.h>@' \
78c5c646
RS
1021 ${LIB}/$file > ${LIB}/${file}.
1022 rm -f ${LIB}/$file; mv ${LIB}/${file}. ${LIB}/$file
75251fe0 1023 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
75251fe0 1024 rm -f ${LIB}/$file
7a0934e7
ILT
1025 else
1026 # Find any include directives that use "file".
1027 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1028 dir=`echo $file | sed -e s'|/[^/]*$||'`
1029 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1030 done
75251fe0
DM
1031 fi
1032fi
1033
1034# Multiline comment after typedef on IRIX 4.0.1.
1035file=sys/types.h
1036if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1037 mkdir ${LIB}/sys 2>/dev/null
1038 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1039 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1040 chmod a+r ${LIB}/$file 2>/dev/null
75251fe0
DM
1041fi
1042
1043if [ -r ${LIB}/$file ]; then
1044 echo Fixing $file, comment in the middle of \#ifdef
1045 sed -e 's@type of the result@type of the result */@' \
1046 -e 's@of the sizeof@/* of the sizeof@' \
1047 ${LIB}/$file > ${LIB}/${file}.sed
1048 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1049 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
75251fe0 1050 rm -f ${LIB}/$file
7a0934e7
ILT
1051 else
1052 # Find any include directives that use "file".
1053 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1054 dir=`echo $file | sed -e s'|/[^/]*$||'`
1055 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1056 done
75251fe0
DM
1057 fi
1058fi
1059
2a46424a
ILT
1060# Turning // comments into /* */ comments trashes this IRIX 4.0.1
1061# header file, which embeds // comments inside multi-line /* */
1062# comments. If this looks like the IRIX header file, we refix it by
1063# just throwing away the // comments.
1064file=fam.h
1065if [ -r ${LIB}/$file ]; then
1066 if egrep indigo.esd ${LIB}/$file > /dev/null; then
1067 echo Fixing $file, overeager sed script
1068 rm ${LIB}/$file
1069 sed -e 's|//.*$||g' $file > ${LIB}/$file
1070 chmod +w ${LIB}/$file 2>/dev/null
1071 chmod a+r ${LIB}/$file 2>/dev/null
1072 fi
1073fi
1074
8bfed528
RS
1075# Some IRIX header files contains the string "//"
1076for file in elf_abi.h elf.h; do
1077 if [ -r ${LIB}/$file ]; then
1078 echo Fixing $file, overeager sed script
1079 sed -e 's|"/\*"\*/|"//"|' ${LIB}/$file > ${LIB}/${file}.sed
1080 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1081 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1082 rm -f ${LIB}/$file
7a0934e7
ILT
1083 else
1084 # Find any include directives that use "file".
1085 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1086 dir=`echo $file | sed -e s'|/[^/]*$||'`
1087 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1088 done
8bfed528 1089 fi
7313c84b 1090 fi
8bfed528 1091done
7313c84b 1092
3b0ad9f9
RK
1093# IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr in prototype without
1094# previous definition.
1095file=rpc/auth.h
1096if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1097 mkdir ${LIB}/rpc 2>/dev/null
1098 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1099 chmod +w ${LIB}/$file 2>/dev/null
1100 chmod a+r ${LIB}/$file 2>/dev/null
1101fi
1102
1103if [ -r ${LIB}/$file ]; then
1104 echo Fixing $file, undefined type
1105 sed -e '/authdes_create.*struct sockaddr/i\
d4c60bd6
ILT
1106struct sockaddr;
1107' \
3b0ad9f9
RK
1108 ${LIB}/$file > ${LIB}/$file.sed
1109 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1110 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1111 rm -f ${LIB}/$file
7a0934e7
ILT
1112 else
1113 # Find any include directives that use "file".
1114 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1115 dir=`echo $file | sed -e s'|/[^/]*$||'`
1116 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1117 done
3b0ad9f9
RK
1118 fi
1119fi
1120
1121# IRIX 4.0.5 <rpc/xdr.h> uses struct __file_s in prototype without previous
1122# definition.
1123file=rpc/xdr.h
1124if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1125 mkdir ${LIB}/rpc 2>/dev/null
1126 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1127 chmod +w ${LIB}/$file 2>/dev/null
1128 chmod a+r ${LIB}/$file 2>/dev/null
1129fi
1130
1131if [ -r ${LIB}/$file ]; then
1132 echo Fixing $file, undefined type
1133 sed -e '/xdrstdio_create.*struct __file_s/i\
d4c60bd6
ILT
1134struct __file_s;
1135' \
3b0ad9f9
RK
1136 ${LIB}/$file > ${LIB}/$file.sed
1137 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1138 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1139 rm -f ${LIB}/$file
7a0934e7
ILT
1140 else
1141 # Find any include directives that use "file".
1142 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1143 dir=`echo $file | sed -e s'|/[^/]*$||'`
1144 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1145 done
3b0ad9f9
RK
1146 fi
1147fi
1148
0ff76398
JW
1149# Same problem with a file from SunOS 4.1.3 : a header file containing
1150# the string "//" embedded in "/**/"
1151file=sbusdev/audiovar.h
1152if [ -r ${LIB}/$file ]; then
1153 echo Fixing $file, overeager sed script
1154 rm ${LIB}/$file
1155 sed -e 's|//.*$||g' $file > ${LIB}/$file
1156 chmod +w ${LIB}/$file 2>/dev/null
1157 chmod a+r ${LIB}/$file 2>/dev/null
1158fi
1159
4d449554
JW
1160# Fix non-ANSI memcpy declaration that conflicts with gcc's builtin
1161# declaration on Sun OS 4.x. We must only fix this on Sun OS 4.x, because
1162# many other systems have similar text but correct versions of the file.
1163# To ensure only Sun's is fixed, we grep for a likely unique string.
1164file=memory.h
6a25991d
RS
1165if [ -r $file ] && egrep '/\* @\(#\)memory\.h 1\.[2-4] 8./../.. SMI; from S5R2 1\.2 \*/' $file > /dev/null; then
1166 if [ ! -r ${LIB}/$file ]; then
4d449554
JW
1167 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1168 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1169 chmod a+r ${LIB}/$file 2>/dev/null
4d449554
JW
1170 fi
1171 if [ -r ${LIB}/$file ]; then
1172 echo Replacing $file
1173 cat > ${LIB}/$file << EOF
1174/* This file was generated by fixincludes */
1175#ifndef __memory_h__
1176#define __memory_h__
1177
1178#ifdef __STDC__
1179extern void *memccpy();
1180extern void *memchr();
1181extern void *memcpy();
1182extern void *memset();
1183#else
1184extern char *memccpy();
1185extern char *memchr();
1186extern char *memcpy();
1187extern char *memset();
1188#endif /* __STDC__ */
1189
1190extern int memcmp();
1191
eb13d323 1192#endif /* __memory_h__ */
4d449554
JW
1193EOF
1194 fi
1195fi
1196
1485e7c1 1197# parameters not const on DECstation Ultrix V4.0 and OSF/1.
7d349561
JW
1198file=stdio.h
1199if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1200 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1201 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1202 chmod a+r ${LIB}/$file 2>/dev/null
7d349561
JW
1203fi
1204
1205if [ -r ${LIB}/$file ]; then
1206 echo Fixing $file, non-const arg
1207 sed -e 's@perror( char \*__s );@perror( const char *__s );@' \
1208 -e 's@fputs( char \*__s,@fputs( const char *__s,@' \
1209 -e 's@fopen( char \*__filename, char \*__type );@fopen( const char *__filename, const char *__type );@' \
1210 -e 's@fwrite( void \*__ptr,@fwrite( const void *__ptr,@' \
1211 -e 's@fscanf( FILE \*__stream, char \*__format,@fscanf( FILE *__stream, const char *__format,@' \
1212 -e 's@scanf( char \*__format,@scanf( const char *__format,@' \
1213 -e 's@sscanf( char \*__s, char \*__format,@sscanf( const char *__s, const char *__format,@' \
1485e7c1
RK
1214 -e 's@popen(char \*, char \*);@popen(const char *, const char *);@' \
1215 -e 's@tempnam(char\*,char\*);@tempnam(const char*,const char*);@' \
7d349561
JW
1216 ${LIB}/$file > ${LIB}/${file}.sed
1217 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1218 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
7d349561 1219 rm -f ${LIB}/$file
7a0934e7
ILT
1220 else
1221 # Find any include directives that use "file".
1222 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1223 dir=`echo $file | sed -e s'|/[^/]*$||'`
1224 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1225 done
7d349561
JW
1226 fi
1227fi
1228
f45a4d6a 1229# parameters conflict with C++ new on rs/6000
255fccf3
PB
1230for file in stdio.h unistd.h ; do
1231 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1232 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1233 chmod +w ${LIB}/$file 2>/dev/null
1234 fi
1235
1236 if [ -r ${LIB}/$file ]; then
1237 echo Fixing $file, parameter name conflicts
1238 sed -e 's@rename(const char \*old, const char \*new)@rename(const char *_old, const char *_new)@' \
1239 ${LIB}/$file > ${LIB}/${file}.sed
1240 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1241 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1242 rm -f ${LIB}/$file
7a0934e7
ILT
1243 else
1244 # Find any include directives that use "file".
1245 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1246 dir=`echo $file | sed -e s'|/[^/]*$||'`
1247 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1248 done
255fccf3
PB
1249 fi
1250 fi
1251done
1252
1253# function class(double x) conflicts with C++ keyword on rs/6000
1254file=math.h
f45a4d6a
JW
1255if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1256 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1257 chmod +w ${LIB}/$file 2>/dev/null
255fccf3 1258 chmod a+r ${LIB}/$file 2>/dev/null
f45a4d6a
JW
1259fi
1260
1261if [ -r ${LIB}/$file ]; then
255fccf3
PB
1262 if grep 'class[(]' ${LIB}/$file >/dev/null; then
1263 echo Fixing $file
1264 sed -e '/class[(]/i\
d4c60bd6
ILT
1265#ifndef __cplusplus
1266' \
255fccf3 1267 -e '/class[(]/a\
d4c60bd6
ILT
1268#endif
1269' ${LIB}/$file > ${LIB}/${file}.sed
255fccf3
PB
1270 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1271 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1272 rm ${LIB}/$file
7a0934e7
ILT
1273 else
1274 # Find any include directives that use "file".
1275 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1276 dir=`echo $file | sed -e s'|/[^/]*$||'`
1277 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1278 done
255fccf3
PB
1279 fi
1280 fi
1281fi
1282
e50ea3d0
RS
1283# Wrong fchmod prototype on RS/6000.
1284file=sys/stat.h
1285if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1286 mkdir ${LIB}/sys 2>/dev/null
1287 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1288 chmod +w ${LIB}/$file 2>/dev/null
1289 chmod a+r ${LIB}/$file 2>/dev/null
1290fi
1291
1292if [ -r ${LIB}/$file ]; then
1293 echo Fixing $file, fchmod prototype
1294 sed -e 's/fchmod(char \*/fchmod(int/' \
1295 ${LIB}/$file > ${LIB}/$file.sed
1296 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1297 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1298 rm -f ${LIB}/$file
7a0934e7
ILT
1299 else
1300 # Find any include directives that use "file".
1301 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1302 dir=`echo $file | sed -e s'|/[^/]*$||'`
1303 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1304 done
e50ea3d0
RS
1305 fi
1306fi
1307
266f3aac
ILT
1308# There are several name conflicts with C++ reserved words in X11
1309# header files. These are fixed in some versions, so don't do the
1310# fixes if we find __cplusplus in the file. These were found on the
1311# RS/6000.
1312
1313# class in X11/ShellP.h
1314file=X11/ShellP.h
1315if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1316 mkdir ${LIB}/sys 2>/dev/null
1317 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1318 chmod +w ${LIB}/$file 2>/dev/null
1319 chmod a+r ${LIB}/$file 2>/dev/null
1320fi
1321
1322if [ -r ${LIB}/$file ]; then
1323 if grep __cplusplus ${LIB}/$file >/dev/null 2>/dev/null; then
1324 true;
1325 else
1326 echo Fixing $file, field class
1327 sed -e '/char [*]class;/i\
1328#ifdef __cplusplus\
1329 char *c_class;\
d4c60bd6
ILT
1330#else
1331' \
266f3aac 1332 -e '/char [*]class;/a\
d4c60bd6
ILT
1333#endif
1334' ${LIB}/$file > ${LIB}/${file}.sed
266f3aac
ILT
1335 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1336 fi
1337 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1338 rm -f ${LIB}/$file
7a0934e7
ILT
1339 else
1340 # Find any include directives that use "file".
1341 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1342 dir=`echo $file | sed -e s'|/[^/]*$||'`
1343 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1344 done
266f3aac
ILT
1345 fi
1346fi
1347# new in Xm/Traversal.h
1348file=Xm/Traversal.h
1349if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1350 mkdir ${LIB}/sys 2>/dev/null
1351 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1352 chmod +w ${LIB}/$file 2>/dev/null
1353 chmod a+r ${LIB}/$file 2>/dev/null
1354fi
1355
1356if [ -r ${LIB}/$file ]; then
1357 if grep __cplusplus ${LIB}/$file >/dev/null 2>/dev/null; then
1358 true;
1359 else
dd22b925 1360 echo Fixing $file, uses of new
266f3aac
ILT
1361 sed -e '/Widget old, new;/i\
1362#ifdef __cplusplus\
1363 Widget old, c_new;\
d4c60bd6
ILT
1364#else
1365' \
266f3aac 1366 -e '/Widget old, new;/a\
d4c60bd6
ILT
1367#endif
1368' \
dd22b925 1369 -e 's/Widget new,/Widget c_new,/g' ${LIB}/$file > ${LIB}/${file}.sed
266f3aac
ILT
1370 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1371 fi
1372 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1373 rm -f ${LIB}/$file
7a0934e7
ILT
1374 else
1375 # Find any include directives that use "file".
1376 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1377 dir=`echo $file | sed -e s'|/[^/]*$||'`
1378 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1379 done
266f3aac
ILT
1380 fi
1381fi
1382# class in Xm/BaseClassI.h
1383file=Xm/BaseClassI.h
1384if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1385 mkdir ${LIB}/sys 2>/dev/null
1386 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1387 chmod +w ${LIB}/$file 2>/dev/null
1388 chmod a+r ${LIB}/$file 2>/dev/null
1389fi
1390
1391if [ -r ${LIB}/$file ]; then
1392 if grep __cplusplus ${LIB}/$file >/dev/null 2>/dev/null; then
1393 true;
1394 else
1395 echo Fixing $file, prototype parameter name
1396 sed -e 's/ class[)]/ c_class)/g' ${LIB}/$file > ${LIB}/${file}.sed
1397 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1398 fi
1399 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1400 rm -f ${LIB}/$file
7a0934e7
ILT
1401 else
1402 # Find any include directives that use "file".
1403 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1404 dir=`echo $file | sed -e s'|/[^/]*$||'`
1405 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1406 done
266f3aac
ILT
1407 fi
1408fi
1409
e12c22a6
RK
1410# NeXT 3.2 adds const prefix to some math functions. These conflict
1411# with the built-in functions.
1412file=ansi/math.h
1413if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1414 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1415 chmod +w ${LIB}/$file 2>/dev/null
1416fi
1417if [ -r ${LIB}/$file ]; then
1418 echo Fixing $file
1419 sed -e '/^extern.*double.*__const__.*cos(/s/__const__//' \
1420 -e '/^extern.*double.*__const__.*sin(/s/__const__//' ${LIB}/$file > ${LIB}/${file}.sed
1421 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1422 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1423 rm -f ${LIB}/$file
1424 else
1425 # Find any include directives that use "file".
1426 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1427 dir=`echo $file | sed -e s'|/[^/]*$||'`
1428 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1429 done
1430 fi
1431fi
1432
1433# NeXT 3.2 uses the word "template" as a parameter for some
1434# functions. GCC reports an invalid use of a reserved key word
1435# with the built-in functions. NeXT 3.2 includes the keyword
1436# volatile in the prototype for abort(). This conflicts with
1437# the built-in definition.
1438file=bsd/libc.h
1439if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1440 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1441 chmod +w ${LIB}/$file 2>/dev/null
1442fi
1443if [ -r ${LIB}/$file ]; then
1444 echo Fixing $file
1445 sed -e '/\(.*template\)/s/template//' \
1446 -e '/extern.*volatile.*void.*abort/s/volatile//' ${LIB}/$file > ${LIB}/${file}.sed
1447 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1448 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1449 rm -f ${LIB}/$file
1450 else
1451 # Find any include directives that use "file".
1452 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1453 dir=`echo $file | sed -e s'|/[^/]*$||'`
1454 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1455 done
1456 fi
1457fi
1458
1459# NeXT 3.2 includes the keyword volatile in the abort() and
1460# exit() function prototypes. That conflicts with the
1461# built-in functions.
1462file=ansi/stdlib.h
1463if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1464 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1465 chmod +w ${LIB}/$file 2>/dev/null
1466fi
1467if [ -r ${LIB}/$file ]; then
1468 echo Fixing $file
1469 sed -e '/extern.*volatile.*void.*exit/s/volatile//' \
1470 -e '/extern.*volatile.*void.*abort/s/volatile//' ${LIB}/$file > ${LIB}/${file}.sed
1471 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1472 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1473 rm -f ${LIB}/$file
1474 else
1475 # Find any include directives that use "file".
1476 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1477 dir=`echo $file | sed -e s'|/[^/]*$||'`
1478 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1479 done
1480 fi
1481fi
266f3aac 1482
08432663
RS
1483# NeXT 2.0 defines 'int wait(union wait*)', which conflicts with Posix.1.
1484# Note that version 3 of the NeXT system has wait.h in a different directory,
1485# so that this code won't do anything. But wait.h in version 3 has a
1486# conditional, so it doesn't need this fix. So everything is okay.
255fccf3
PB
1487file=sys/wait.h
1488if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1489 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1490 chmod +w ${LIB}/$file 2>/dev/null
1491fi
1492
1493if [ -r ${LIB}/$file ] \
1494 && grep 'wait[(]union wait' ${LIB}/$file >/dev/null; then
1495 echo Fixing $file, bad wait formal
1496 sed -e 's@wait(union wait@wait(void@' ${LIB}/$file > ${LIB}/${file}.sed
f45a4d6a
JW
1497 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1498 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1499 rm -f ${LIB}/$file
7a0934e7
ILT
1500 else
1501 # Find any include directives that use "file".
1502 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1503 dir=`echo $file | sed -e s'|/[^/]*$||'`
1504 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1505 done
f45a4d6a
JW
1506 fi
1507fi
1508
1ac7d389 1509# Don't use or define the name va_list in stdio.h.
5560c9b3 1510# This is for ANSI and also to interoperate properly with gcc's varargs.h.
1ac7d389
RS
1511file=stdio.h
1512if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1513 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1514 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1515 chmod a+r ${LIB}/$file 2>/dev/null
1ac7d389
RS
1516fi
1517
1518if [ -r ${LIB}/$file ]; then
1519 echo Fixing $file, use of va_list
1520 # Arrange for stdio.h to use stdarg.h to define __gnuc_va_list
29421402
ILT
1521 if egrep "__need___va_list" ${LIB}/$file >/dev/null 2>&1; then
1522 touch ${LIB}/${file}.sed
1523 else
1524 (echo "#define __need___va_list"
1525 echo "#include <stdarg.h>") > ${LIB}/${file}.sed
1526 fi
1ac7d389 1527 # Use __gnuc_va_list in arg types in place of va_list.
d5891360
JW
1528 # On 386BSD use __gnuc_va_list instead of _VA_LIST_. We're hoping the
1529 # trailing parentheses and semicolon save all other systems from this.
1ac7d389
RS
1530 # Define __va_list__ (something harmless and unused) instead of va_list.
1531 # Don't claim to have defined va_list.
1532 sed -e 's@ va_list @ __gnuc_va_list @' \
8befb954 1533 -e 's@ va_list)@ __gnuc_va_list)@' \
e3124505 1534 -e 's@ _BSD_VA_LIST_));@ __gnuc_va_list));@' \
d5891360 1535 -e 's@ _VA_LIST_));@ __gnuc_va_list));@' \
1ac7d389 1536 -e 's@ va_list@ __va_list__@' \
be71bebd 1537 -e 's@\*va_list@*__va_list__@' \
0f20ebd1 1538 -e 's@ __va_list)@ __gnuc_va_list)@' \
29421402 1539 -e 's@GNUC_VA_LIST@GNUC_Va_LIST@' \
75d98655 1540 -e 's@_NEED___VA_LIST@_NEED___Va_LIST@' \
1ac7d389 1541 -e 's@VA_LIST@DUMMY_VA_LIST@' \
29421402 1542 -e 's@_Va_LIST@_VA_LIST@' \
1ac7d389
RS
1543 ${LIB}/$file >> ${LIB}/${file}.sed
1544
1545 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1546 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1ac7d389 1547 rm -f ${LIB}/$file
7a0934e7
ILT
1548 else
1549 # Find any include directives that use "file".
1550 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1551 dir=`echo $file | sed -e s'|/[^/]*$||'`
1552 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1553 done
1ac7d389
RS
1554 fi
1555fi
1556
e63c1d35
RS
1557# Cancel out ansi_compat.h on Ultrix. Replace it with empty file.
1558file=ansi_compat.h
1559if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1560 if grep -s ULTRIX $file; then
1561 echo "/* This file intentionally left blank. */" > $LIB/$file
1562 fi
1563fi
1564
a1eb0286 1565# parameter to atof not const on DECstation Ultrix V4.0 and NEWS-OS 4.2R.
28bbe06b 1566# also get rid of bogus inline definitions in HP-UX 8.0
7d349561
JW
1567file=math.h
1568if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1569 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1570 chmod +w ${LIB}/$file 2>/dev/null
2e4cd151 1571 chmod a+r ${LIB}/$file 2>/dev/null
7d349561
JW
1572fi
1573
1574if [ -r ${LIB}/$file ]; then
1575 echo Fixing $file, non-const arg
a1eb0286 1576 sed -e 's@atof(\([ ]*char[ ]*\*[^)]*\))@atof(const \1)@' \
ee3ac81d 1577 -e 's@inline int abs(int [a-z][a-z]*) {.*}@extern "C" int abs(int);@' \
e6093ed4
RS
1578 -e 's@inline double abs(double [a-z][a-z]*) {.*}@@' \
1579 -e 's@inline int sqr(int [a-z][a-z]*) {.*}@@' \
1580 -e 's@inline double sqr(double [a-z][a-z]*) {.*}@@' \
7d349561 1581 ${LIB}/$file > ${LIB}/${file}.sed
73b73053
RK
1582 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1583 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1584 rm -f ${LIB}/$file
1585 else
1586 # Find any include directives that use "file".
1587 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1588 dir=`echo $file | sed -e s'|/[^/]*$||'`
1589 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1590 done
1591 fi
1592fi
1593
1594# fix bogus recursive stdlib.h in NEWS-OS 4.0C
1595file=stdlib.h
1596if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1597 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1598 chmod +w ${LIB}/$file 2>/dev/null
1599 chmod a+r ${LIB}/$file 2>/dev/null
1600fi
1601
1602if [ -r ${LIB}/$file ]; then
1603 echo Fixing $file, recursive inclusion
1604 sed -e '/^#include <stdlib.h>/i\
1605#if 0
1606' \
1607 -e '/^#include <stdlib.h>/a\
1608#endif
1609' \
1610 ${LIB}/$file > ${LIB}/${file}.sed
7d349561
JW
1611 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1612 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
7d349561 1613 rm -f ${LIB}/$file
7a0934e7
ILT
1614 else
1615 # Find any include directives that use "file".
1616 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1617 dir=`echo $file | sed -e s'|/[^/]*$||'`
1618 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1619 done
7d349561
JW
1620 fi
1621fi
1622
e50ea3d0
RS
1623# Avoid nested comments on Ultrix 4.3.
1624file=rpc/svc.h
1625if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1626 mkdir ${LIB}/rpc 2>/dev/null
1627 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1628 chmod +w ${LIB}/$file 2>/dev/null
1629 chmod a+r ${LIB}/$file 2>/dev/null
1630fi
1631
1632if [ -r ${LIB}/$file ]; then
1633 echo Fixing $file, nested comment
1634 sed -e 's@^\( \* int protocol; \)/\*@\1*/ /*@' \
1635 ${LIB}/$file > ${LIB}/$file.sed
1636 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1637 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1638 rm -f ${LIB}/$file
7a0934e7
ILT
1639 else
1640 # Find any include directives that use "file".
1641 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1642 dir=`echo $file | sed -e s'|/[^/]*$||'`
1643 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1644 done
e50ea3d0
RS
1645 fi
1646fi
1647
a6642da8
JW
1648# This file in RISC/os uses /**/ to concatenate two tokens.
1649file=bsd43/bsd43_.h
1650if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1651 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1652 chmod +w ${LIB}/$file 2>/dev/null
1653 chmod a+r ${LIB}/$file 2>/dev/null
1654fi
1655if [ -r ${LIB}/$file ]; then
1656 sed -e 's|/\*\*/|##|' ${LIB}/$file > ${LIB}/${file}.sed
1657 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1658 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1659 rm -f ${LIB}/$file
7a0934e7
ILT
1660 else
1661 # Find any include directives that use "file".
1662 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1663 dir=`echo $file | sed -e s'|/[^/]*$||'`
1664 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1665 done
a6642da8
JW
1666 fi
1667fi
1668
3b0ad9f9
RK
1669file=rpc/rpc.h
1670if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1671 mkdir ${LIB}/rpc 2>/dev/null
1672 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1673 chmod +w ${LIB}/$file 2>/dev/null
1674 chmod a+r ${LIB}/$file 2>/dev/null
1675fi
1676
1677if [ -r ${LIB}/$file ]; then
1678 echo Fixing $file, nested comment
1679 sed -e 's@^\(/\*.*rpc/auth_des.h>.*\)/\*@\1*/ /*@' \
1680 ${LIB}/$file > ${LIB}/$file.sed
1681 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1682 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1683 rm -f ${LIB}/$file
7a0934e7
ILT
1684 else
1685 # Find any include directives that use "file".
1686 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1687 dir=`echo $file | sed -e s'|/[^/]*$||'`
1688 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1689 done
3b0ad9f9
RK
1690 fi
1691fi
1692
6ef797ea
RS
1693# In limits.h, put #ifndefs around things that are supposed to be defined
1694# in float.h to avoid redefinition errors if float.h is included first.
c49c4803
ILT
1695# On HP/UX this patch does not work, because on HP/UX limits.h uses
1696# multi line comments and the inserted #endif winds up inside the
1697# comment. Fortunately, HP/UX already uses #ifndefs in limits.h; if
1698# we find a #ifndef FLT_MIN we assume that all the required #ifndefs
1699# are there, and we do not add them ourselves.
e50ea3d0
RS
1700for file in limits.h sys/limits.h; do
1701 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1702 mkdir ${LIB}/sys 2>/dev/null
1703 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1704 chmod +w ${LIB}/$file 2>/dev/null
1705 chmod a+r ${LIB}/$file 2>/dev/null
1706 fi
6ef797ea 1707
e50ea3d0
RS
1708 if [ -r ${LIB}/$file ]; then
1709 if egrep 'ifndef[ ]+FLT_MIN' ${LIB}/$file >/dev/null; then
1710 true
1711 else
1712 echo Fixing $file
1713 sed -e '/[ ]FLT_MIN[ ]/i\
d4c60bd6
ILT
1714#ifndef FLT_MIN
1715'\
e50ea3d0 1716 -e '/[ ]FLT_MIN[ ]/a\
d4c60bd6
ILT
1717#endif
1718'\
e50ea3d0 1719 -e '/[ ]FLT_MAX[ ]/i\
d4c60bd6
ILT
1720#ifndef FLT_MAX
1721'\
e50ea3d0 1722 -e '/[ ]FLT_MAX[ ]/a\
d4c60bd6
ILT
1723#endif
1724'\
e50ea3d0 1725 -e '/[ ]FLT_DIG[ ]/i\
d4c60bd6
ILT
1726#ifndef FLT_DIG
1727'\
e50ea3d0 1728 -e '/[ ]FLT_DIG[ ]/a\
d4c60bd6
ILT
1729#endif
1730'\
e50ea3d0 1731 -e '/[ ]DBL_MIN[ ]/i\
d4c60bd6
ILT
1732#ifndef DBL_MIN
1733'\
e50ea3d0 1734 -e '/[ ]DBL_MIN[ ]/a\
d4c60bd6
ILT
1735#endif
1736'\
e50ea3d0 1737 -e '/[ ]DBL_MAX[ ]/i\
d4c60bd6
ILT
1738#ifndef DBL_MAX
1739'\
e50ea3d0 1740 -e '/[ ]DBL_MAX[ ]/a\
d4c60bd6
ILT
1741#endif
1742'\
e50ea3d0 1743 -e '/[ ]DBL_DIG[ ]/i\
d4c60bd6
ILT
1744#ifndef DBL_DIG
1745'\
e50ea3d0 1746 -e '/[ ]DBL_DIG[ ]/a\
d4c60bd6
ILT
1747#endif
1748'\
e50ea3d0
RS
1749 ${LIB}/$file > ${LIB}/${file}.sed
1750 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1751 fi
1752 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1753 echo Deleting ${LIB}/$file\; no fixes were needed.
1754 rm -f ${LIB}/$file
7a0934e7
ILT
1755 else
1756 # Find any include directives that use "file".
1757 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1758 dir=`echo $file | sed -e s'|/[^/]*$||'`
1759 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1760 done
e50ea3d0 1761 fi
6ef797ea 1762 fi
e50ea3d0 1763done
6ef797ea 1764
303b6ca3
JW
1765# In math.h, put #ifndefs around things that might be defined in a gcc
1766# specific math-*.h file.
1767file=math.h
1768if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1769 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1770 chmod +w ${LIB}/$file 2>/dev/null
1771 chmod a+r ${LIB}/$file 2>/dev/null
1772fi
1773
1774if [ -r ${LIB}/$file ]; then
1775 echo Fixing $file
1776 sed -e '/define[ ]HUGE_VAL[ ]/i\
d4c60bd6
ILT
1777#ifndef HUGE_VAL
1778'\
303b6ca3 1779 -e '/define[ ]HUGE_VAL[ ]/a\
d4c60bd6
ILT
1780#endif
1781'\
303b6ca3
JW
1782 ${LIB}/$file > ${LIB}/${file}.sed
1783 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
09130b78
BC
1784
1785 # In addition, copy the definition of DBL_MAX from float.h
1786 # if math.h requires one. The Lynx math.h requires it.
1787 if egrep '#define[ ]*HUGE_VAL[ ]+DBL_MAX' $file >/dev/null 2>&1; then
1788 if egrep '#define[ ]+DBL_MAX[ ]+' $file >/dev/null 2>&1; then
1789 true;
1790 else
1791 dbl_max_def=`egrep 'define[ ]+DBL_MAX[ ]+.*' float.h 2>/dev/null`
1792 if [ "$dbl_max_def" != "" ]; then
1793 dbl_max_def=`echo $dbl_max_def | sed 's/.*define[ ]*DBL_MAX[ ]*//'`
1794 sed -e "/define[ ]HUGE_VAL[ ]DBL_MAX/s/DBL_MAX/$dbl_max_def/" \
1795 ${LIB}/$file > ${LIB}/${file}.sed
d67342cd 1796 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
09130b78
BC
1797 fi
1798 fi
1799 fi
86bb0d5f 1800
303b6ca3
JW
1801 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1802 echo Deleting ${LIB}/$file\; no fixes were needed.
1803 rm -f ${LIB}/$file
7a0934e7
ILT
1804 else
1805 # Find any include directives that use "file".
1806 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1807 dir=`echo $file | sed -e s'|/[^/]*$||'`
1808 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1809 done
303b6ca3
JW
1810 fi
1811fi
1812
f90ac35b
RK
1813# Remove erroneous parentheses in sym.h on Alpha OSF/1.
1814file=sym.h
1815if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1816 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1817 chmod +w ${LIB}/$file 2>/dev/null
1818 chmod a+r ${LIB}/$file 2>/dev/null
1819fi
1820
1821if [ -r ${LIB}/$file ]; then
1822 echo Fixing $file
1823 sed -e 's/#ifndef(__mips64)/#ifndef __mips64/' \
1824 ${LIB}/$file > ${LIB}/${file}.sed
1825 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1826 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1827 rm -f ${LIB}/$file
7a0934e7
ILT
1828 else
1829 # Find any include directives that use "file".
1830 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1831 dir=`echo $file | sed -e s'|/[^/]*$||'`
1832 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1833 done
f90ac35b
RK
1834 fi
1835fi
1836
09130b78 1837# Correct the return type for strlen in string.h on Lynx.
787e63c8 1838# Correct the argument type for ffs in string.h on Alpha OSF/1 V2.0.
1485e7c1 1839# Add missing const for strdup on OSF/1 V3.0.
09130b78
BC
1840file=string.h
1841if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1842 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1843 chmod +w ${LIB}/$file 2>/dev/null
1844 chmod a+r ${LIB}/$file 2>/dev/null
1845fi
1846
1847if [ -r ${LIB}/$file ]; then
1848 echo Fixing $file
1849 sed -e 's/extern[ ]*int[ ]*strlen();/extern unsigned int strlen();/' \
787e63c8 1850 -e 's/extern[ ]*int[ ]*ffs[ ]*(long);/extern int ffs(int);/' \
1485e7c1 1851 -e 's/strdup(char \*s1);/strdup(const char *s1);/' \
09130b78
BC
1852 ${LIB}/$file > ${LIB}/${file}.sed
1853 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1854 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1855 rm -f ${LIB}/$file
7a0934e7
ILT
1856 else
1857 # Find any include directives that use "file".
1858 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1859 dir=`echo $file | sed -e s'|/[^/]*$||'`
1860 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1861 done
09130b78
BC
1862 fi
1863fi
1864
7374f95a
JW
1865# Correct the return type for strlen in strings.h in SunOS 4.
1866file=strings.h
1867if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1868 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1869 chmod +w ${LIB}/$file 2>/dev/null
1870 chmod a+r ${LIB}/$file 2>/dev/null
1871fi
1872
1873if [ -r ${LIB}/$file ]; then
1874 echo Fixing $file
1875 sed -e 's/int[ ]*strlen();/__SIZE_TYPE__ strlen();/' \
1876 ${LIB}/$file > ${LIB}/${file}.sed
1877 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1878 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1879 rm -f ${LIB}/$file
1880 else
1881 # Find any include directives that use "file".
1882 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1883 dir=`echo $file | sed -e s'|/[^/]*$||'`
1884 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1885 done
1886 fi
1887fi
1888
09130b78
BC
1889# Delete the '#define void int' line from curses.h on Lynx
1890file=curses.h
1891if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1892 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1893 chmod +w ${LIB}/$file 2>/dev/null
1894 chmod a+r ${LIB}/$file 2>/dev/null
1895fi
1896
1897if [ -r ${LIB}/$file ]; then
1898 echo Fixing $file
26dac810 1899 sed -e '/#[ ]*define[ ][ ]*void[ ]int/d' \
09130b78
BC
1900 ${LIB}/$file > ${LIB}/${file}.sed
1901 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
0323c178
ILT
1902 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1903 rm -f ${LIB}/$file
1904 else
1905 # Find any include directives that use "file".
1906 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1907 dir=`echo $file | sed -e s'|/[^/]*$||'`
1908 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1909 done
1910 fi
1911fi
1912
1913# Fix `typedef struct term;' on hppa1.1-hp-hpux9.
1914file=curses.h
1915if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1916 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1917 chmod +w ${LIB}/$file 2>/dev/null
1918 chmod a+r ${LIB}/$file 2>/dev/null
1919fi
1920
1921if [ -r ${LIB}/$file ]; then
1922 echo Fixing $file
1923 sed -e 's/^[ ]*typedef[ ][ ]*\(struct[ ][ ]*term[ ]*;[ ]*\)$/\1/' \
1924 ${LIB}/$file > ${LIB}/${file}.sed
1925 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
7a0934e7
ILT
1926 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1927 rm -f ${LIB}/$file
1928 else
1929 # Find any include directives that use "file".
1930 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1931 dir=`echo $file | sed -e s'|/[^/]*$||'`
1932 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1933 done
09130b78
BC
1934 fi
1935fi
1936
e53076d6
ILT
1937# For C++, avoid any typedef or macro definition of bool, and use the
1938# built in type instead.
1939for files in curses.h; do
1940 if [ -r $file ] && egrep bool $file >/dev/null 2>&1; then
1941 if [ ! -r ${LIB}/$file ]; then
1942 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1943 chmod +w ${LIB}/$file 2>/dev/null
1944 chmod a+r ${LIB}/$file 2>/dev/null
1945 fi
1946
1947 echo Fixing $file
1948 sed -e '/^#[ ]*define[ ][ ]*bool[ ][ ]*char[ ]*$/i\
1949#ifndef __cplusplus'\
1950 -e '/^#[ ]*define[ ][ ]*bool[ ][ ]*char[ ]*$/a\
1951#endif'\
afa1dec9 1952 -e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;[ ]*$/i\
e53076d6 1953#ifndef __cplusplus'\
afa1dec9 1954 -e '/^typedef[ ][ ]*char[ ][ ]*bool[ ]*;[ ]*$/a\
e53076d6
ILT
1955#endif'\
1956 ${LIB}/$file > ${LIB}/${file}.sed
1957 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1958 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1959 rm -f ${LIB}/$file
7a0934e7
ILT
1960 else
1961 # Find any include directives that use "file".
1962 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1963 dir=`echo $file | sed -e s'|/[^/]*$||'`
1964 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1965 done
e53076d6
ILT
1966 fi
1967 fi
1968done
1969
1daf7029
RS
1970# Fix incorrect S_IF* definitions on m88k-sysv3.
1971file=sys/stat.h
1972if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1973 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1974 chmod +w ${LIB}/$file 2>/dev/null
1975 chmod a+r ${LIB}/$file 2>/dev/null
1976fi
1977
1978if [ -r ${LIB}/$file ]; then
1979 echo Fixing $file
1980 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)/' \
1981 -e 's/^\(#define[ ]*S_IS[A-Z]*(m)\)[ ]*(m[ ]*&[ ]*\(0[0-9]*\)[ ]*)/\1 (((m)\&S_IFMT)==\2)/' \
1982 ${LIB}/$file > ${LIB}/${file}.sed
1983 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
1984 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
1985 rm -f ${LIB}/$file
7a0934e7
ILT
1986 else
1987 # Find any include directives that use "file".
1988 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
1989 dir=`echo $file | sed -e s'|/[^/]*$||'`
1990 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
1991 done
1daf7029
RS
1992 fi
1993fi
1994
639010af 1995# Fix getopt declarations in stdio.h and stdlib.h on Alpha OSF/1 and AIX.
e50ea3d0
RS
1996for file in stdio.h stdlib.h; do
1997 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
1998 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
1999 chmod +w ${LIB}/$file 2>/dev/null
2000 chmod a+r ${LIB}/$file 2>/dev/null
2001 fi
2002
2003 if [ -r ${LIB}/$file ]; then
2004 echo Fixing $file, getopt declaration
639010af 2005 sed -e 's/getopt(int, char \*\[\],[ ]*char \*)/getopt(int, char *const[], const char *)/' \
e50ea3d0
RS
2006 ${LIB}/$file > ${LIB}/${file}.sed
2007 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2008 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2009 rm -f ${LIB}/$file
7a0934e7
ILT
2010 else
2011 # Find any include directives that use "file".
2012 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2013 dir=`echo $file | sed -e s'|/[^/]*$||'`
2014 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2015 done
e50ea3d0
RS
2016 fi
2017 fi
2018done
2019
315198ab
RS
2020# Determine if we're on Interactive Unix 2.2 or later, in which case we
2021# need to fix some additional files. This is the same test for ISC that
2022# Autoconf uses.
2023if test -d /etc/conf/kconfig.d \
2024 && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1; then
2025 echo "Fixing ISC __STDC__ goof in several files..."
2026 for name in stdio.h math.h ctype.h sys/limits.h sys/fcntl.h sys/dirent.h; do
2027 echo $name
2028 if test -r ${LIB}/$name; then
2029 file=${LIB}/$name
2030 else
2031 file=${INPUT}/$name
2032 fi
2033 # On Interactive 2.2, certain traditional Unix definitions
2034 # (notably getc and putc in stdio.h) are omitted if __STDC__ is
2035 # defined, not just if _POSIX_SOURCE is defined. This makes it
2036 # impossible to compile any nontrivial program except with -posix.
2037 sed \
2038's/!defined(__STDC__) && !defined(_POSIX_SOURCE)/!defined(_POSIX_SOURCE)/' \
2039 < $file > ${LIB}/$name.
2040 mv ${LIB}/$name. ${LIB}/$name
2041 done
2042
2043 echo "Fixing ISC fmod declaration"
2044 # This one's already been fixed for other things.
2045 file=${LIB}/math.h
2046 sed 's/fmod(double)/fmod(double, double)/' <$file >$file.
2047 mv $file. $file
2048
2049 echo "Fixing nested comments in ISC <sys/limits.h>"
2050 file=sys/limits.h
2051 sed '/CHILD_MAX/s,/\* Max, Max,' < ${INPUT}/$file >${LIB}/$file.
2052 sed '/OPEN_MAX/s,/\* Max, Max,' < ${LIB}/$file. >${LIB}/$file
2053fi
2054
3b8b3c98
JW
2055# These files in Sun OS 4.x use /**/ to concatenate tokens.
2056for file in sparc/asm_linkage.h sun3/asm_linkage.h sun3x/asm_linkage.h \
2057 sun4/asm_linkage.h sun4c/asm_linkage.h sun4m/asm_linkage.h \
2058 sun4c/debug/asm_linkage.h sun4m/debug/asm_linkage.h;
19571479
RS
2059do
2060 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2061 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2062 chmod +w ${LIB}/$file 2>/dev/null
2063 chmod a+r ${LIB}/$file 2>/dev/null
2064 fi
2065
2066 if [ -r ${LIB}/$file ]; then
2067 sed -e 's|/\*\*/|##|g' ${LIB}/$file > ${LIB}/${file}.sed
2068 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2069 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2070 rm -f ${LIB}/$file
7a0934e7
ILT
2071 else
2072 # Find any include directives that use "file".
2073 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2074 dir=`echo $file | sed -e s'|/[^/]*$||'`
2075 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2076 done
19571479
RS
2077 fi
2078 fi
2079done
2080
2081# These files in ARM/RISCiX use /**/ to concatenate tokens.
2082for file in arm/as_support.h arm/mc_type.h arm/xcb.h dev/chardefmac.h \
1f10df15 2083 dev/ps_irq.h dev/screen.h dev/scsi.h sys/tty.h Xm.acorn/XmP.h
3b8b3c98
JW
2084do
2085 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2086 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2087 chmod +w ${LIB}/$file 2>/dev/null
2088 chmod a+r ${LIB}/$file 2>/dev/null
2089 fi
2090
2091 if [ -r ${LIB}/$file ]; then
2092 sed -e 's|/\*\*/|##|g' ${LIB}/$file > ${LIB}/${file}.sed
2093 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2094 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2095 rm -f ${LIB}/$file
7a0934e7
ILT
2096 else
2097 # Find any include directives that use "file".
2098 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2099 dir=`echo $file | sed -e s'|/[^/]*$||'`
2100 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2101 done
3b8b3c98
JW
2102 fi
2103 fi
2104done
2105
68f6ed7f
JM
2106# math.h on SunOS 4 puts the declaration of matherr before the definition
2107# of struct exception, so the prototype (added by fixproto) causes havoc.
2108file=math.h
2109if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2110 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2111 chmod +w ${LIB}/$file 2>/dev/null
2112 chmod a+r ${LIB}/$file 2>/dev/null
2113fi
2114
2115if [ -r ${LIB}/$file ]; then
2116 echo Fixing $file, matherr declaration
2117 sed -e '/^struct exception/,$b' \
2118 -e '/matherr/i\
2119struct exception;
2120'\
2121 ${LIB}/$file > ${LIB}/${file}.sed
2122 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2123 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2124 rm -f ${LIB}/$file
7a0934e7
ILT
2125 else
2126 # Find any include directives that use "file".
2127 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2128 dir=`echo $file | sed -e s'|/[^/]*$||'`
2129 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2130 done
68f6ed7f
JM
2131 fi
2132fi
2133
86bb0d5f
ILT
2134# assert.h on HP/UX is not C++ ready, even though NO_IMPLICIT_EXTERN_C
2135# is defined on HP/UX.
2136file=assert.h
2137if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2138 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2139 chmod +w ${LIB}/$file 2>/dev/null
2140 chmod a+r ${LIB}/$file 2>/dev/null
2141fi
2142
2143if [ -r ${LIB}/$file ]; then
29421402
ILT
2144 if egrep '"C"' ${LIB}/$file >/dev/null 2>&1 \
2145 || egrep '__BEGIN_DECLS' ${LIB}/$file >/dev/null 2>&1; then
86bb0d5f
ILT
2146 true
2147 else
2148 echo Fixing $file
2149 echo '#ifdef __cplusplus
2150extern "C" {
2151#endif' > ${LIB}/${file}.sed
2152 cat ${LIB}/${file} >> ${LIB}/${file}.sed
2153 echo '#ifdef __cplusplus
2154}
2155#endif' >> ${LIB}/${file}.sed
2156 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2157 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2158 rm -f ${LIB}/$file
7a0934e7
ILT
2159 else
2160 # Find any include directives that use "file".
2161 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2162 dir=`echo $file | sed -e s'|/[^/]*$||'`
2163 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2164 done
86bb0d5f
ILT
2165 fi
2166 fi
2167fi
2168
e5b3d86a
JM
2169# check for broken assert.h that needs stdio.h or stdlib.h
2170file=assert.h
2171if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2172 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2173 chmod +w ${LIB}/$file 2>/dev/null
2174 chmod a+r ${LIB}/$file 2>/dev/null
2175fi
2176
2177if [ -r ${LIB}/$file ]; then
4e373a59
ILT
2178 if grep 'stderr' ${LIB}/$file >/dev/null 2>/dev/null; then
2179 if grep 'include.*stdio.h' ${LIB}/$file >/dev/null 2>/dev/null; then
e5b3d86a
JM
2180 true
2181 else
2182 echo "Fixing $file (needs stdio.h)"
cfe8fed0
ILT
2183 echo '#ifdef __cplusplus
2184#include <stdio.h>
2185#endif' >>${LIB}/$file
e5b3d86a
JM
2186 fi
2187 fi
4e373a59
ILT
2188 if grep 'exit *(' ${LIB}/$file >/dev/null 2>/dev/null ||
2189 grep 'abort *(' ${LIB}/$file >/dev/null 2>/dev/null; then
2190 if grep 'include.*stdlib.h' ${LIB}/$file >/dev/null 2>/dev/null; then
e5b3d86a
JM
2191 true
2192 else
2193 echo "Fixing $file (needs stdlib.h)"
cfe8fed0
ILT
2194 echo '#ifdef __cplusplus
2195#include <stdlib.h>
2196#endif' >>${LIB}/$file
e5b3d86a
JM
2197 fi
2198 fi
2199 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
4e373a59 2200 rm -f ${LIB}/$file
7a0934e7
ILT
2201 else
2202 # Find any include directives that use "file".
2203 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2204 dir=`echo $file | sed -e s'|/[^/]*$||'`
2205 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2206 done
4e373a59
ILT
2207 fi
2208fi
2209
2210# Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
2211file=unistd.h
2212if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2213 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2214 chmod +w ${LIB}/$file 2>/dev/null
2215 chmod a+r ${LIB}/$file 2>/dev/null
2216fi
2217
2218if [ -r ${LIB}/$file ]; then
2219 echo Fixing $file, sbrk declaration
2220 sed -e 's/char\([ ]*\*[ ]*sbrk[ ]*(\)/void\1/' \
2221 ${LIB}/$file > ${LIB}/${file}.sed
2222 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2223 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
e5b3d86a 2224 rm -f ${LIB}/$file
7a0934e7
ILT
2225 else
2226 # Find any include directives that use "file".
2227 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2228 dir=`echo $file | sed -e s'|/[^/]*$||'`
2229 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2230 done
e5b3d86a
JM
2231 fi
2232fi
2233
bb7c21a5
ILT
2234# This file on SunOS 4 has a very large macro. When the sed loop
2235# tries pull it in, it overflows the pattern space size of the SunOS
2236# sed (GNU sed does not have this problem). Since the file does not
2237# require fixing, we remove it from the fixed directory.
2238file=sundev/ipi_error.h
2239if [ -r ${LIB}/$file ]; then
2240 echo "Removing incorrect fix to SunOS <sundev/ipi_error.h>"
2241 rm -f ${LIB}/$file
2242fi
2243
bc026668
ILT
2244# Put cpp wrappers around these include files to avoid redeclaration
2245# errors during multiple inclusion on m88k-tektronix-sysv3.
2246for file in time.h sys/time.h ; do
29421402
ILT
2247 if egrep '#ifndef' $file >/dev/null 2>&1; then
2248 true
2249 else
2250 if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2251 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2252 chmod +w ${LIB}/$file 2>/dev/null
2253 fi
2254 if [ -r ${LIB}/$file ]; then
2255 echo Fixing $file, to protect against multiple inclusion.
2256 cpp_wrapper=`echo $file | sed -e 's,\.,_,g' -e 's,/,_,g'`
2257 (echo "#ifndef __GCC_GOT_${cpp_wrapper}_"
2258 echo "#define __GCC_GOT_${cpp_wrapper}_"
2259 cat ${LIB}/${file}
2260 echo '#endif /* !_GCC_GOT_'${cpp_wrapper}_' */') > ${LIB}/${file}.new
2261 rm -f ${LIB}/$file; mv ${LIB}/${file}.new ${LIB}/$file
2262 fi
bc026668
ILT
2263 fi
2264done
2265
26dac810
ILT
2266# Fix fcntl prototype in fcntl.h on LynxOS.
2267file=fcntl.h
2268if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2269 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2270 chmod +w ${LIB}/$file 2>/dev/null
2271 chmod a+r ${LIB}/$file 2>/dev/null
2272fi
2273
2274if [ -r ${LIB}/$file ]; then
2275 echo Fixing $file, fcntl declaration
2276 sed -e 's/\(fcntl.*(int, int, \)int)/\1...)/' \
2277 ${LIB}/$file > ${LIB}/${file}.sed
2278 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2279 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2280 rm -f ${LIB}/$file
7a0934e7
ILT
2281 else
2282 # Find any include directives that use "file".
2283 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2284 dir=`echo $file | sed -e s'|/[^/]*$||'`
2285 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2286 done
26dac810
ILT
2287 fi
2288fi
2289
e571db98
ILT
2290# Fix definitions of macros used by va-i960.h in VxWorks header file.
2291file=arch/i960/archI960.h
2292if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2293 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2294 chmod +w ${LIB}/$file 2>/dev/null
2295 chmod a+r ${LIB}/$file 2>/dev/null
2296fi
2297
2298if [ -r ${LIB}/$file ]; then
2299 echo Fixing $file
2300 sed -e 's/__vsiz/__vxvsiz/' -e 's/__vali/__vxvali/' \
2301 -e s'/__vpad/__vxvpad/' -e 's/__alignof__/__vxalignof__/' \
2302 ${LIB}/$file > ${LIB}/${file}.sed
2303 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2304 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2305 rm -f ${LIB}/$file
2306 else
2307 # Find any include directives that use "file".
2308 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2309 dir=`echo $file | sed -e s'|/[^/]*$||'`
2310 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2311 done
2312 fi
2313fi
2314
2315# Make VxWorks header which is almost gcc ready fully gcc ready.
2316file=types/vxTypesBase.h
2317if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2318 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2319 chmod +w ${LIB}/$file 2>/dev/null
2320 chmod a+r ${LIB}/$file 2>/dev/null
2321fi
2322
2323if [ -r ${LIB}/$file ]; then
2324 echo Fixing $file
2325 sed -e 's/#ifdef __GNUC_TYPEOF_FEATURE_BROKEN_USE_DEFAULT_UNTIL_FIXED__/#if 1/' \
2326 -e '/[ ]size_t/i\
2327#ifndef _GCC_SIZE_T\
2328#define _GCC_SIZE_T
2329' \
2330 -e '/[ ]size_t/a\
2331#endif
2332' \
2333 -e '/[ ]ptrdiff_t/i\
2334#ifndef _GCC_PTRDIFF_T\
2335#define _GCC_PTRDIFF_T
2336' \
2337 -e '/[ ]ptrdiff_t/a\
2338#endif
2339' \
2340 -e '/[ ]wchar_t/i\
2341#ifndef _GCC_WCHAR_T\
2342#define _GCC_WCHAR_T
2343' \
2344 -e '/[ ]wchar_t/a\
2345#endif
2346' \
2347 ${LIB}/$file > ${LIB}/${file}.sed
2348 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2349 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2350 rm -f ${LIB}/$file
2351 else
2352 # Find any include directives that use "file".
2353 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2354 dir=`echo $file | sed -e s'|/[^/]*$||'`
2355 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2356 done
2357 fi
2358fi
2359
2360# Fix VxWorks <sys/stat.h> to not require including <vxWorks.h>.
2361file=sys/stat.h
2362if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2363 mkdir ${LIB}/sys 2>/dev/null
2364 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2365 chmod +w ${LIB}/$file 2>/dev/null
2366 chmod a+r ${LIB}/$file 2>/dev/null
2367fi
2368
2369if [ -r ${LIB}/$file ]; then
2370 if egrep '#include' ${LIB}/$file >/dev/null 2>&1; then
2371 :
2372 else
2373 if egrep 'ULONG' ${LIB}/$file >/dev/null 2>&1 \
2374 && [ -r types/vxTypesOld.h ]; then
2375 echo Fixing $file
2376 sed -e '/#define[ ][ ]*__INCstath/a\
2377#include <types/vxTypesOld.h>
2378' \
2379 ${LIB}/$file > ${LIB}/${file}.sed
2380 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2381 fi
2382 fi
2383 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2384 rm -f ${LIB}/$file
2385 else
2386 # Find any include directives that use "file".
2387 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2388 dir=`echo $file | sed -e s'|/[^/]*$||'`
2389 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2390 done
2391 fi
2392fi
2393
2394# Fix VxWorks <time.h> to not require including <vxTypes.h>.
2395file=time.h
2396if [ -r $file ] && [ ! -r ${LIB}/$file ]; then
2397 mkdir ${LIB}/sys 2>/dev/null
2398 cp $file ${LIB}/$file >/dev/null 2>&1 || echo "Can't copy $file"
2399 chmod +w ${LIB}/$file 2>/dev/null
2400 chmod a+r ${LIB}/$file 2>/dev/null
2401fi
2402
2403if [ -r ${LIB}/$file ]; then
2404 if egrep 'uint_t[ ][ ]*_clocks_per_sec' ${LIB}/$file >/dev/null 2>&1; then
2405 echo Fixing $file
2406 sed -e 's/uint_t/unsigned int/' ${LIB}/$file > ${LIB}/${file}.sed
2407 rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
2408 fi
2409 if cmp $file ${LIB}/$file >/dev/null 2>&1; then
2410 rm -f ${LIB}/$file
2411 else
2412 # Find any include directives that use "file".
2413 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' ${LIB}/$file | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2414 dir=`echo $file | sed -e s'|/[^/]*$||'`
2415 required="$required ${INPUT} $dir/$include ${LIB}/$dir/$include"
2416 done
2417 fi
2418fi
2419
2420
ce942994
ILT
2421# This loop does not appear to do anything, because it uses file
2422# rather than $file when setting target. It also appears to be
2423# unnecessary, since the main loop processes symbolic links.
2424#if $LINKS; then
2425# echo 'Making internal symbolic non-directory links'
2426# cd ${INPUT}
2427# files=`find . -type l -print`
2428# for file in $files; do
2429# dest=`ls -ld $file | sed -n 's/.*-> //p'`
2430# if expr "$dest" : '[^/].*' > /dev/null; then
2431# target=${LIB}/`echo file | sed "s|[^/]*\$|$dest|"`
2432# if [ -f $target ]; then
2433# ln -s $dest ${LIB}/$file >/dev/null 2>&1
2434# fi
2435# fi
2436# done
2437#fi
c61a25b1 2438
8f8470e0
RS
2439# Make sure that any include files referenced using double quotes
2440# exist in the fixed directory. This comes last since otherwise
2441# we might end up deleting some of these files "because they don't
2442# need any change."
98068ba2
ILT
2443set x $required
2444shift
2445while [ $# != 0 ]; do
8f8470e0 2446 newreq=
8f8470e0
RS
2447 while [ $# != 0 ]; do
2448 # $1 is the directory to copy from, $2 is the unfixed file,
2449 # $3 is the fixed file name.
2450 cd ${INPUT}
2451 cd $1
2452 if [ -r $2 ] && [ ! -r $3 ]; then
2453 cp $2 $3 >/dev/null 2>&1 || echo "Can't copy $2"
2454 chmod +w $3 2>/dev/null
2455 chmod a+r $3 2>/dev/null
2456 echo Copied $2
2457 for include in `egrep '^[ ]*#[ ]*include[ ]*"[^/]' $3 | sed -e 's/^[ ]*#[ ]*include[ ]*"\([^"]*\)".*$/\1/'`; do
2458 dir=`echo $2 | sed -e s'|/[^/]*$||'`
2459 dir2=`echo $3 | sed -e s'|/[^/]*$||'`
2460 newreq="$newreq $1 $dir/$include $dir2/$include"
2461 done
2462 fi
2463 shift; shift; shift
2464 done
98068ba2
ILT
2465 set x $newreq
2466 shift
8f8470e0
RS
2467done
2468
25e51a69
ILT
2469echo 'Cleaning up DONE files.'
2470cd $LIB
dca82465 2471find . -name DONE -exec rm -f '{}' ';'
db27aeec 2472
bf8b268a
ILT
2473echo 'Removing unneeded directories:'
2474cd $LIB
2475files=`find . -type d -print | sort -r`
2476for file in $files; do
2477 rmdir $LIB/$file > /dev/null 2>&1
2478done
2479
c61a25b1 2480exit 0
This page took 0.577929 seconds and 5 git commands to generate.