diagnostic.h (verbatim): Move ...

	* diagnostic.h (verbatim): Move ...
	* toplev.h (verbatim): ... here.  Add ATTRIBUTE_GCC_DIAG.
	* pretty-print.h (pp_verbatim): Add ATTRIBUTE_GCC_PPDIAG.

From-SVN: r101157

gcc/ChangeLog

+2005-06-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* diagnostic.h (verbatim): Move ...
+	* toplev.h (verbatim): ... here.  Add ATTRIBUTE_GCC_DIAG.
+	* pretty-print.h (pp_verbatim): Add ATTRIBUTE_GCC_PPDIAG.
+
 2005-06-18  Roger Sayle  <roger@eyesopen.com>
 
 	PR target/22083

gcc/diagnostic.h

@@ -186,7 +186,6 @@ extern void diagnostic_set_info (diagnostic_info *, const char *, va_list *,
 extern char *diagnostic_build_prefix (diagnostic_info *);
 
 /* Pure text formatting support functions.  */
-extern void verbatim (const char *, ...);
 extern char *file_name_as_prefix (const char *);
 
 /* In tree-pretty-print.c  */

gcc/pretty-print.h

@@ -261,7 +261,8 @@ extern void pp_base_append_text (pretty_printer *, const char *, const char *);
 extern void pp_printf (pretty_printer *, const char *, ...)
      ATTRIBUTE_GCC_PPDIAG(2,3);
 
-extern void pp_verbatim (pretty_printer *, const char *, ...);
+extern void pp_verbatim (pretty_printer *, const char *, ...)
+     ATTRIBUTE_GCC_PPDIAG(2,3);
 extern void pp_base_flush (pretty_printer *);
 extern void pp_base_prepare_to_format (pretty_printer *, text_info *,
 				       location_t *);

gcc/toplev.h

@@ -73,6 +73,7 @@ extern void fatal_error (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2)
 extern void pedwarn (const char *, ...) ATTRIBUTE_GCC_FE_DIAG(1,2);
 extern void sorry (const char *, ...) ATTRIBUTE_GCC_FE_DIAG(1,2);
 extern void inform (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
+extern void verbatim (const char *, ...) ATTRIBUTE_GCC_DIAG(1,2);
 
 extern void rest_of_decl_compilation (tree, int, int);
 extern void rest_of_type_compilation (tree, int);