* coretypes.h (cpp_reader): Forward declare struct.

        * c-pragma.h (cpp_reader): Remove forward declaration.
        * hashtable.h (cpp_reader): Likewise.
        * scan.h (cpp_reader): Likewise.
        * tree.h (cpp_reader): Likewise.
        * config/darwin-protos.h (cpp_reader): Likewise.
        * config/arm/arm-protos.h (cpp_reader): Likewise.
        * config/rs6000/rs6000-protos.h: Remove GCC_CPPLIB_H ifdef, use
        struct cpp_reader in prototypes.


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

9 files changed, 20 insertions, 14 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 49754d025f9..89ffb384282 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-28  Stan Shebs  <shebs@apple.com>
+
+	* coretypes.h (cpp_reader): Forward declare struct.
+	* c-pragma.h (cpp_reader): Remove forward declaration.
+	* hashtable.h (cpp_reader): Likewise.
+	* scan.h (cpp_reader): Likewise.
+	* tree.h (cpp_reader): Likewise.
+	* config/darwin-protos.h (cpp_reader): Likewise.
+	* config/arm/arm-protos.h (cpp_reader): Likewise.
+	* config/rs6000/rs6000-protos.h: Remove GCC_CPPLIB_H ifdef, use
+	struct cpp_reader in prototypes.
+
 2003-01-28  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
 
 	* doc/install.texi: Add documentation for installation into
diff --git a/gcc/c-pragma.h b/gcc/c-pragma.h
index d90be3d6d22..f6cf50f52ca 100644
--- a/gcc/c-pragma.h
+++ b/gcc/c-pragma.h
@@ -26,7 +26,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #define YYDEBUG 1
 extern int yydebug;
 
-struct cpp_reader;
 extern struct cpp_reader* parse_in;
 
 #ifdef HANDLE_SYSV_PRAGMA
diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 5fed1df3efc..1c3764d61c1 100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -214,7 +214,6 @@ extern rtx arm_expand_builtin		PARAMS ((tree, rtx, rtx,
 					       enum machine_mode, int));
 #endif
 
-struct cpp_reader;
 extern void arm_pr_long_calls		PARAMS ((struct cpp_reader *));
 extern void arm_pr_no_long_calls	PARAMS ((struct cpp_reader *));
 extern void arm_pr_long_calls_off	PARAMS ((struct cpp_reader *));
diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h
index 77ef93f53c7..d199854a633 100644
--- a/gcc/config/darwin-protos.h
+++ b/gcc/config/darwin-protos.h
@@ -74,7 +74,6 @@ extern void machopic_select_section PARAMS ((tree, int,
 extern void machopic_select_rtx_section PARAMS ((enum machine_mode, rtx,
 						 unsigned HOST_WIDE_INT));
 
-struct cpp_reader;
 extern void darwin_pragma_ignore PARAMS ((struct cpp_reader *));
 extern void darwin_pragma_options PARAMS ((struct cpp_reader *));
 extern void darwin_pragma_unused PARAMS ((struct cpp_reader *));
diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index a7ec02b03e2..8dcfd8766f5 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -196,9 +196,7 @@ extern int rs6000_memory_move_cost PARAMS ((enum machine_mode,
 
 /* Declare functions in rs6000-c.c */
 
-#ifdef GCC_CPPLIB_H
-extern void rs6000_pragma_longcall PARAMS ((cpp_reader *));
-extern void rs6000_cpu_cpp_builtins PARAMS ((cpp_reader *));
-#endif
+extern void rs6000_pragma_longcall PARAMS ((struct cpp_reader *));
+extern void rs6000_cpu_cpp_builtins PARAMS ((struct cpp_reader *));
 
 #endif  /* rs6000-protos.h */
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index d381c281983..e800d004252 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -44,6 +44,12 @@ typedef struct rtvec_def *rtvec;
 union tree_node;
 typedef union tree_node *tree;
 
+/* Provide forward struct declaration so that we don't have to include
+   all of cpplib.h whenever a random prototype includes a pointer.
+   Note that the cpp_reader typedef remains part of cpplib.h.  */
+
+struct cpp_reader;
+
 #else
 
 struct _dont_use_rtx_here_;
diff --git a/gcc/hashtable.h b/gcc/hashtable.h
index f6fe27a0bcc..d0367049694 100644
--- a/gcc/hashtable.h
+++ b/gcc/hashtable.h
@@ -32,11 +32,6 @@ struct ht_identifier GTY(())
 #define HT_LEN(NODE) ((NODE)->len)
 #define HT_STR(NODE) ((NODE)->str)
 
-/* We want code outside cpplib, such as the compiler front-ends, to be
-   able to include this header, and to be able to link with
-   cpphashtbl.o without pulling in any other parts of cpplib.  */
-
-struct cpp_reader;
 typedef struct ht hash_table;
 typedef struct ht_identifier *hashnode;
 
diff --git a/gcc/scan.h b/gcc/scan.h
index 8b74f8e1246..9f30bdecda2 100644
--- a/gcc/scan.h
+++ b/gcc/scan.h
@@ -65,7 +65,6 @@ extern void recognized_function _PARAMS((const struct cpp_token *,
 extern void recognized_extern _PARAMS((const struct cpp_token *));
 extern unsigned int hashstr _PARAMS((const char *, unsigned int));
 
-struct cpp_reader;
 extern int scan_decls _PARAMS((struct cpp_reader *, int, char **));
 
 /* get_token is a simple C lexer.  */
diff --git a/gcc/tree.h b/gcc/tree.h
index 0b6b4e0fea2..b124a507b73 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2374,7 +2374,6 @@ enum attribute_flags
 
 extern tree merge_decl_attributes PARAMS ((tree, tree));
 extern tree merge_type_attributes PARAMS ((tree, tree));
-struct cpp_reader;
 extern void default_register_cpp_builtins PARAMS ((struct cpp_reader *));
 
 /* Split a list of declspecs and attributes into two.  */