Commit 224b1df0 by Ian Lance Taylor

Use __SIZE_TYPE__ for size_t type, rather than running gcc to get it.

From-SVN: r6563
parent e138174b
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
# See README-fixinc for more information. # See README-fixinc for more information.
# Command to run gcc.
GCCCMD=${4-${GCCCMD-gcc}}
# Directory where gcc sources (and sometimes special include files) live. # Directory where gcc sources (and sometimes special include files) live.
# fixincludes doesn't use this, but fixinc.svr4 does, and I want to make # fixincludes doesn't use this, but fixinc.svr4 does, and I want to make
# sure somebody doesn't try to use arg3 for something incompatible. -- gumby # sure somebody doesn't try to use arg3 for something incompatible. -- gumby
...@@ -353,15 +350,12 @@ for file in sys/types.h stdlib.h sys/stdtypes.h stddef.h memory.h unistd.h; do ...@@ -353,15 +350,12 @@ for file in sys/types.h stdlib.h sys/stdtypes.h stddef.h memory.h unistd.h; do
fi fi
if [ -r ${LIB}/$file ]; then if [ -r ${LIB}/$file ]; then
echo Fixing $file comment echo Fixing size_t in $file
# Get the definition of __SIZE_TYPE__, if any. sed -e '/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/i\
# (This file must be called something.c). #ifndef __SIZE_TYPE__\
echo "__SIZE_TYPE__" > ${LIB}/types.c #define __SIZE_TYPE__ long unsigned int\
foo=`${GCCCMD} -E -P ${LIB}/types.c` #endif' \
rm -f ${LIB}/types.c -e 's/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/typedef __SIZE_TYPE__ size_t/' ${LIB}/$file > ${LIB}/${file}.sed
# Default to our preferred type.
if [ "$foo" = __SIZE_TYPE__ ]; then foo="unsigned long int"; fi
sed -e "s/typedef[ ][ ]*[a-z_][ a-z_]*[ ]size_t/typedef $foo size_t/" ${LIB}/$file > ${LIB}/${file}.sed
rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file rm -f ${LIB}/$file; mv ${LIB}/${file}.sed ${LIB}/$file
if cmp $file ${LIB}/$file >/dev/null 2>&1; then if cmp $file ${LIB}/$file >/dev/null 2>&1; then
rm ${LIB}/$file rm ${LIB}/$file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment