aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-08-13 07:44:06 +0000
committerlaw <law@138bc75d-0d04-0410-961f-82ee72b054a4>1999-08-13 07:44:06 +0000
commit3e140f6f95d662110608e8cb32af46f0786fe545 (patch)
treea0014e5478043f7e8bbb97b69589c9da9cfae90b
parentf522b07504b6a7f5aac15758ba38f1ca339e7da9 (diff)
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-2_95-branch@28697 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/fixinc/fixincl.x1
-rw-r--r--gcc/fixinc/inclhack.def1
-rwxr-xr-xgcc/fixinc/inclhack.sh1
-rwxr-xr-xgcc/fixincludes1
5 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 71b7806c3f0..b730db140e9 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 aacc190f327..bbd17eac8e0 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 7a9e305adb1..6872cad61d0 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 3445ce67119..f6fab88798b 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 ea031833016..e5cc1c373b6 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\