* cfns.gperf (hash, libc_name_p): Prototype.

	* rtti.c (build_dynamic_cast_1): Constification.

	* search.c (dfs_debug_unmarkedp, dfs_debug_mark): Unhide prototypes.

	* semantics.c (deferred_type_access_control): Prototype.


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

6 files changed, 31 insertions, 4 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8fcacd2720e..91ff2c906f1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,13 @@
+2000-04-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* cfns.gperf (hash, libc_name_p): Prototype.
+
+	* rtti.c (build_dynamic_cast_1): Constification.
+
+	* search.c (dfs_debug_unmarkedp, dfs_debug_mark): Unhide prototypes.
+
+	* semantics.c (deferred_type_access_control): Prototype.
+
 2000-04-04  Mark Mitchell  <mark@codesourcery.com>
 
 	Correct many new ABI issues regarding vbase and vcall offset
diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
index d7a530a6d4b..0d1e71b9a8d 100644
--- a/gcc/cp/cfns.gperf
+++ b/gcc/cp/cfns.gperf
@@ -1,3 +1,13 @@
+%{
+#ifdef __GNUC__
+__inline
+#endif
+static unsigned int hash PARAMS ((const char *, unsigned int));
+#ifdef __GNUC__
+__inline
+#endif
+const char * libc_name_p PARAMS ((const char *, unsigned int));
+%}
 # The standard C library functions, for feeding to gperf; the result is used
 # by nothrow_libfn_p.
 #
diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
index df8c7b58be2..c7e6a9d9412 100644
--- a/gcc/cp/cfns.h
+++ b/gcc/cp/cfns.h
@@ -1,5 +1,13 @@
 /* C code produced by gperf version 2.7 */
-/* Command-line: gperf -o -C -E -k 1-6,$ -j1 -D -N libc_name_p /home/jason/eg/gcc/cp/cfns.gperf  */
+/* Command-line: gperf -o -C -E -k 1-6,$ -j1 -D -N libc_name_p ../../../egcs-CVS20000404/gcc/cp/cfns.gperf  */
+#ifdef __GNUC__
+__inline
+#endif
+static unsigned int hash PARAMS ((const char *, unsigned int));
+#ifdef __GNUC__
+__inline
+#endif
+const char * libc_name_p PARAMS ((const char *, unsigned int));
 /* maximum key range = 1020, duplicates = 1 */
 
 #ifdef __GNUC__
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index a5429ecfcc6..293d9e12786 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -559,7 +559,7 @@ build_dynamic_cast_1 (type, expr)
   tree exprtype;
   tree dcast_fn;
   tree old_expr = expr;
-  char* errstr = NULL;
+  const char *errstr = NULL;
 
   /* T shall be a pointer or reference to a complete class type, or
      `pointer to cv void''.  */
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 4c4b600659f..616933bb2fb 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -108,10 +108,8 @@ static tree marked_new_vtablep PARAMS ((tree, void *));
 static tree unmarked_new_vtablep PARAMS ((tree, void *));
 static tree marked_pushdecls_p PARAMS ((tree, void *));
 static tree unmarked_pushdecls_p PARAMS ((tree, void *));
-#if 0
 static tree dfs_debug_unmarkedp PARAMS ((tree, void *));
 static tree dfs_debug_mark PARAMS ((tree, void *));
-#endif
 static tree dfs_find_vbases PARAMS ((tree, void *));
 static tree dfs_clear_vbase_slots PARAMS ((tree, void *));
 static tree dfs_init_vbase_pointers PARAMS ((tree, void *));
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 08d7774eb17..a6bb2293f82 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -48,6 +48,7 @@
 static tree expand_cond PARAMS ((tree));
 static tree maybe_convert_cond PARAMS ((tree));
 static tree simplify_aggr_init_exprs_r PARAMS ((tree *, int *, void *));
+static void deferred_type_access_control PARAMS ((void));
 
 /* Record the fact that STMT was the last statement added to the
    statement tree.  */