diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 31b5b87ac42..98fcabc6a0a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-04  Gabriel Dos Reis <gdr@integrable-solutions.net>
+
+	* toplev.h (pedwarn_with_file_and_line): Don't declare.
+	* diagnostic.c (pedwarn_with_file_and_line): Remove.
+
 2003-05-04  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* varasm.c (assemble_variable): Don't use error_with_file_and_line.
diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 5f3a6d0da10..58450b1a361 100644
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -993,23 +993,6 @@ pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...))
   VA_CLOSE (ap);
 }
 
-/* Same as above but within the context FILE and LINE.  */
-void
-pedwarn_with_file_and_line VPARAMS ((const char *file, int line,
-				     const char *msgid, ...))
-{
-  diagnostic_info diagnostic;
-  VA_OPEN (ap, msgid);
-  VA_FIXEDARG (ap, const char *, file);
-  VA_FIXEDARG (ap, int, line);
-  VA_FIXEDARG (ap, const char *, msgid);
-
-  diagnostic_set_info (&diagnostic, _(msgid), &ap, file, line,
-                       pedantic_error_kind ());
-  report_diagnostic (&diagnostic);
-  VA_CLOSE (ap);
-}
-
 /* Just apologize with MSGID.  */
 void
 sorry VPARAMS ((const char *msgid, ...))
diff --git a/gcc/toplev.h b/gcc/toplev.h
index de13bc249ff..7da7654a093 100644
--- a/gcc/toplev.h
+++ b/gcc/toplev.h
@@ -59,8 +59,6 @@ extern void error			PARAMS ((const char *, ...));
 extern void fatal_error			PARAMS ((const char *, ...))
 					       ATTRIBUTE_NORETURN;
 extern void pedwarn			PARAMS ((const char *, ...));
-extern void pedwarn_with_file_and_line	PARAMS ((const char *, int,
-						 const char *, ...));
 extern void warning_with_file_and_line	PARAMS ((const char *, int,
 						 const char *, ...));
 extern void error_with_file_and_line	PARAMS ((const char *, int,