From: Jeffrey A Law <law@cygnus.com>
Date: Fri, 13 Aug 1999 07:44:06 +0000 (+0000)
Subject: fixincludes: Fix the return type of bsearch, char* -> void*.
X-Git-Tag: releases/gcc-2.95.1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1eb2eb9000cf0d4f5a3c3fd0d5ab3321e1d3840;p=thirdparty%2Fgcc.git

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

       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.

From-SVN: r28697
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 71b7806c3f05..b730db140e95 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 13 01:42:24 1999  Jeffrey A Law  (law@cygnus.com)
+
+	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.
+
 Fri Aug 13 01:29:57 1999  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* dwarfout.c (fundamental_type_code): Return FT_boolean for
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x
index aacc190f3271..bbd17eac8e0b 100644
--- a/gcc/fixinc/fixincl.x
+++ b/gcc/fixinc/fixincl.x
@@ -2821,6 +2821,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 7a9e305adb1e..6872cad61d07 100644
--- a/gcc/fixinc/inclhack.def
+++ b/gcc/fixinc/inclhack.def
@@ -2000,6 +2000,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 3445ce671193..f6fab88798be 100755
--- a/gcc/fixinc/inclhack.sh
+++ b/gcc/fixinc/inclhack.sh
@@ -2331,6 +2331,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 ea0318330168..e5cc1c373b69 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\