* fixincludes: Fix the return type of bsearch, char* -> void*.

        * fixinc/inclhack.def: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28440 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6baa333..e3f9157 100644 (file)
--- 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 (executable)
--- 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 (file)
--- 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 (file)
--- 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 (executable)
--- 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 (executable)
--- 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\