darwin-protos.h, [...]: Use struct, and don't conditionally compile on GCC_C_PRAGMA_H.

	* config/darwin-protos.h, config/c4x/c4x-protos.h,
	config/cris/cris-protos.h, config/i370/i370-protos.h,
	config/i960/i960-protos.h, config/ia64/ia64-protos.h,
	config/v850/v850-protos.h: Use struct, and don't conditionally
	compile on GCC_C_PRAGMA_H.

From-SVN: r60762

8 files changed, 30 insertions, 37 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 78dc996..6ce97be 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-01  Neil Booth  <neil@daikokuya.co.uk>
+
+	* config/darwin-protos.h, config/c4x/c4x-protos.h,
+	config/cris/cris-protos.h, config/i370/i370-protos.h,
+	config/i960/i960-protos.h, config/ia64/ia64-protos.h,
+	config/v850/v850-protos.h: Use struct, and don't conditionally
+	compile on GCC_C_PRAGMA_H.
+
 2003-01-01  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/arm/arm-protos.h: Remove #ifdef GCC_C_PRAGMA_H.
diff --git a/gcc/config/c4x/c4x-protos.h b/gcc/config/c4x/c4x-protos.h
index 7bdc1bd..ce3bde8 100644
--- a/gcc/config/c4x/c4x-protos.h
+++ b/gcc/config/c4x/c4x-protos.h
@@ -293,15 +293,13 @@ extern enum machine_mode c4x_caller_save_map[FIRST_PSEUDO_REGISTER];
 extern int c4x_rpts_cycles;	        /* Max cycles for RPTS.  */
 extern int c4x_cpu_version;		/* Cpu version C30/31/32/40/44.  */
 
-#ifdef GCC_C_PRAGMA_H
-extern void c4x_pr_CODE_SECTION		PARAMS ((cpp_reader *));
-extern void c4x_pr_DATA_SECTION		PARAMS ((cpp_reader *));
-extern void c4x_pr_FUNC_IS_PURE		PARAMS ((cpp_reader *));
-extern void c4x_pr_FUNC_NEVER_RETURNS	PARAMS ((cpp_reader *));
-extern void c4x_pr_INTERRUPT		PARAMS ((cpp_reader *));
-extern void c4x_pr_ignored		PARAMS ((cpp_reader *));
+extern void c4x_pr_CODE_SECTION		PARAMS ((struct cpp_reader *));
+extern void c4x_pr_DATA_SECTION		PARAMS ((struct cpp_reader *));
+extern void c4x_pr_FUNC_IS_PURE		PARAMS ((struct cpp_reader *));
+extern void c4x_pr_FUNC_NEVER_RETURNS	PARAMS ((struct cpp_reader *));
+extern void c4x_pr_INTERRUPT		PARAMS ((struct cpp_reader *));
+extern void c4x_pr_ignored		PARAMS ((struct cpp_reader *));
 extern void c4x_init_pragma		PARAMS ((int (*) (tree *)));
-#endif
 
 extern GTY(()) tree code_tree;
 extern GTY(()) tree data_tree;
diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h
index 7da668ee..fba20c4 100644
--- a/gcc/config/cris/cris-protos.h
+++ b/gcc/config/cris/cris-protos.h
@@ -52,9 +52,7 @@ extern rtx cris_expand_builtin_va_arg PARAMS ((tree, tree));
 # endif
 #endif /* RTX_CODE */
 
-#ifdef GCC_C_PRAGMA_H
-extern void cris_pragma_expand_mul PARAMS ((cpp_reader *));
-#endif
+extern void cris_pragma_expand_mul PARAMS ((struct cpp_reader *));
 
 /* Need one that returns an int; usable in expressions. */
 extern int cris_fatal PARAMS ((char *));
diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h
index 5fea152..913f15f 100644
--- a/gcc/config/darwin-protos.h
+++ b/gcc/config/darwin-protos.h
@@ -72,11 +72,9 @@ extern void machopic_select_section PARAMS ((tree, int,
 extern void machopic_select_rtx_section PARAMS ((enum machine_mode, rtx,
 						 unsigned HOST_WIDE_INT));
 
-#ifdef GCC_C_PRAGMA_H
-extern void darwin_pragma_ignore PARAMS ((cpp_reader *));
-extern void darwin_pragma_options PARAMS ((cpp_reader *));
-extern void darwin_pragma_unused PARAMS ((cpp_reader *));
-#endif
+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 *));
 
 /* Expanded by EXTRA_SECTION_FUNCTIONS into varasm.o.  */
 extern void const_section PARAMS ((void));
diff --git a/gcc/config/i370/i370-protos.h b/gcc/config/i370/i370-protos.h
index a3f4acd..c2cd0ea 100644
--- a/gcc/config/i370/i370-protos.h
+++ b/gcc/config/i370/i370-protos.h
@@ -51,8 +51,6 @@ extern int mvs_check_alias PARAMS ((const char *, char *));
 extern void check_label_emit PARAMS ((void));
 extern void mvs_free_label_list PARAMS ((void));
 
-#ifdef GCC_C_PRAGMA_H
-extern void i370_pr_map PARAMS ((cpp_reader *));
-#endif
+extern void i370_pr_map PARAMS ((struct cpp_reader *));
 
 #endif /* ! GCC_I370_PROTOS_H */
diff --git a/gcc/config/i960/i960-protos.h b/gcc/config/i960/i960-protos.h
index 7e2685d..aa4d2ec 100644
--- a/gcc/config/i960/i960-protos.h
+++ b/gcc/config/i960/i960-protos.h
@@ -98,9 +98,7 @@ extern int compute_frame_size PARAMS ((int));
 extern void output_function_profiler PARAMS ((FILE *, int));
 extern void i960_scan_opcode PARAMS ((const char *));
 
-#ifdef GCC_C_PRAGMA_H
-extern void i960_pr_align PARAMS ((cpp_reader *));
-extern void i960_pr_noalign PARAMS ((cpp_reader *));
-#endif
+extern void i960_pr_align PARAMS ((struct cpp_reader *));
+extern void i960_pr_noalign PARAMS ((struct cpp_reader *));
 
 #endif /* ! GCC_I960_PROTOS_H  */
diff --git a/gcc/config/ia64/ia64-protos.h b/gcc/config/ia64/ia64-protos.h
index 36af17a..0aba939 100644
--- a/gcc/config/ia64/ia64-protos.h
+++ b/gcc/config/ia64/ia64-protos.h
@@ -145,8 +145,5 @@ extern void sbss_section PARAMS ((void));
 extern enum direction ia64_hpux_function_arg_padding PARAMS ((enum machine_mode, tree));
 #endif /* ARGS_SIZE_RTX */
 
-#ifdef GCC_C_PRAGMA_H
-extern void ia64_hpux_handle_builtin_pragma PARAMS ((cpp_reader *));
-#endif
-
+extern void ia64_hpux_handle_builtin_pragma PARAMS ((struct cpp_reader *));
 extern void ia64_hpux_asm_file_end PARAMS ((FILE *));
diff --git a/gcc/config/v850/v850-protos.h b/gcc/config/v850/v850-protos.h
index a381a3e..d618aea 100644
--- a/gcc/config/v850/v850-protos.h
+++ b/gcc/config/v850/v850-protos.h
@@ -89,16 +89,14 @@ extern int    function_arg_partial_nregs    PARAMS ((CUMULATIVE_ARGS *, Mmode, t
 #endif
 #endif
 
-#ifdef GCC_C_PRAGMA_H
-extern void ghs_pragma_section		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_interrupt	    PARAMS ((cpp_reader *));
-extern void ghs_pragma_starttda		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_startsda		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_startzda		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_endtda		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_endsda		    PARAMS ((cpp_reader *));
-extern void ghs_pragma_endzda		    PARAMS ((cpp_reader *));
-#endif
+extern void ghs_pragma_section		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_interrupt	    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_starttda		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_startsda		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_startzda		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_endtda		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_endsda		    PARAMS ((struct cpp_reader *));
+extern void ghs_pragma_endzda		    PARAMS ((struct cpp_reader *));
 
 #undef  Mmode