diff options
| author | Kaveh R. Ghazi <ghazi@caip.rutgers.edu> | 1999-08-03 04:06:31 +0000 |
|---|---|---|
| committer | Kaveh Ghazi <ghazi@gcc.gnu.org> | 1999-08-03 04:06:31 +0000 |
| commit | c354f40df2214ac7e6e2df4ac7df84476ba154ed (patch) | |
| tree | d86e3677a34df11f9724c0170a4d0e6872323fe5 | |
| parent | ce12589b90b25a836b7a06a7c4b9bbc4ddec407f (diff) | |
| download | gcc-c354f40df2214ac7e6e2df4ac7df84476ba154ed.zip gcc-c354f40df2214ac7e6e2df4ac7df84476ba154ed.tar.gz gcc-c354f40df2214ac7e6e2df4ac7df84476ba154ed.tar.bz2 | |
fixincludes: Fix the return type of bsearch, char* -> void*.
* fixincludes: Fix the return type of bsearch, char* -> void*.
* fixinc/inclhack.def: Likewise.
From-SVN: r28440
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/fixinc/fixincl.sh | 2 | ||||
| -rw-r--r-- | gcc/fixinc/fixincl.x | 1 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 1 | ||||
| -rwxr-xr-x | gcc/fixinc/inclhack.sh | 1 | ||||
| -rwxr-xr-x | gcc/fixincludes | 1 |
6 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6baa333..e3f9157 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 3 00:03:41 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * fixincludes: Fix the return type of bsearch, char* -> void*. + + * fixinc/inclhack.def: Likewise. + Mon Aug 2 18:29:32 1999 Mark Mitchell <mark@codesourcery.com> * invoke.texi (-fdump-translation-unit): New option. diff --git a/gcc/fixinc/fixincl.sh b/gcc/fixinc/fixincl.sh index a7661ba..fd357a3 100755 --- a/gcc/fixinc/fixincl.sh +++ b/gcc/fixinc/fixincl.sh @@ -6,7 +6,7 @@ # files which are fixed to work correctly with ANSI C and placed in a # directory that GNU C will search. # -# This script contains 104 fixup scripts. +# This script contains 105 fixup scripts. # # See README-fixinc for more information. # diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index 5f79228..92fe69b 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -2946,6 +2946,7 @@ const char* apzSysz_Stdlib_For_SunPatch[] = { "sed", "-e", "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g", "-e", "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g", "-e", "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g", + "-e", "s/char[ \t]*\\*[ \t]*bsearch/void \\*\tbsearch/g", "-e", "s/int[ \t][ \t]*exit/void\texit/g", "-e", "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n\ #ifndef _GCC_SIZE_T\\\n\ diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index a1fc549..c5c4a1c 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -2083,6 +2083,7 @@ fix = { sed = "s/char[ \t]*\\*[ \t]*calloc/void \\*\tcalloc/g"; sed = "s/char[ \t]*\\*[ \t]*malloc/void \\*\tmalloc/g"; sed = "s/char[ \t]*\\*[ \t]*realloc/void \\*\trealloc/g"; + sed = "s/char[ \t]*\\*[ \t]*bsearch/void \\*\tbsearch/g"; sed = "s/int[ \t][ \t]*exit/void\texit/g"; sed = "/typedef[ \ta-zA-Z_]*[ \t]size_t[ \t]*;/i\\\n" diff --git a/gcc/fixinc/inclhack.sh b/gcc/fixinc/inclhack.sh index ec2501b..67577cb 100755 --- a/gcc/fixinc/inclhack.sh +++ b/gcc/fixinc/inclhack.sh @@ -2440,6 +2440,7 @@ extern unsigned int\ -e 's/char[ ]*\*[ ]*calloc/void \* calloc/g' \ -e 's/char[ ]*\*[ ]*malloc/void \* malloc/g' \ -e 's/char[ ]*\*[ ]*realloc/void \* realloc/g' \ + -e 's/char[ ]*\*[ ]*bsearch/void \* bsearch/g' \ -e 's/int[ ][ ]*exit/void exit/g' \ -e '/typedef[ a-zA-Z_]*[ ]size_t[ ]*;/i\ #ifndef _GCC_SIZE_T\ diff --git a/gcc/fixincludes b/gcc/fixincludes index ea03183..e5cc1c3 100755 --- a/gcc/fixincludes +++ b/gcc/fixincludes @@ -1002,6 +1002,7 @@ if [ -r ${LIB}/$file ]; then -e 's/char[ ]*\*[ ]*calloc/void \* calloc/g' \ -e 's/char[ ]*\*[ ]*malloc/void \* malloc/g' \ -e 's/char[ ]*\*[ ]*realloc/void \* realloc/g' \ + -e 's/char[ ]*\*[ ]*bsearch/void \* bsearch/g' \ -e 's/int[ ][ ]*exit/void exit/g' \ -e "/$size_t_pattern/"'i\ #ifndef _GCC_SIZE_T\ |