* cpplib.c (my_strerror, cpp_error, cpp_error_with_line,

	cpp_error_from_errno, cpp_warning, cpp_warning_with_line,
	cpp_pedwarn, cpp_pedwarn_with_line,
	cpp_pedwarn_with_file_and_line): Move to cpperror.c.
	(cpp_print_file_and_line, v_cpp_error, v_cpp_warning,
	v_cpp_error_with_line, v_cpp_warning_with_line,
	cpp_message_from_errno, cpp_perror_with_name): Delete.

	* cpperror.c (cpp_print_containing_files): Take starting
	buffer as argument.
	(cpp_file_line_for_message): Rename to cpp_print_file_and_line.
	(v_cpp_message): Now called directly by all entry points.
	Remove -1 case.
	(cpp_pfatal_with_name, cpp_message): Delete.
	(cpp_notice_from_errno, cpp_ice): New functions.
	(cpp_notice): Is now for reporting error conditions, just
	without an associated file.
	(cpp_error, cpp_error_with_line): Don't do anything if
	opts->inhibit_errors is on.
	(cpp_pedwarn_with_file_and_line): Take column argument also.

	* cpplib.h: Update prototypes of exported functions.
	(struct cpp_options): Add inhibit_errors.

	* cppalloc.c, cppfiles.c: Use fprintf not cpp_notice for
	non-error messages.  Include intl.h.

	* cppinit.c, cppmain.c: Likewise.  Also, use
	cpp_notice_from_errno instead of cpp_perror_with_name or
	cpp_pfatal_with_name, and cpp_notice instead of cpp_message.

	* cppexp.c, cpphash.c, cppinit.c, cpplib.c: Use cpp_ice to
	report internal errors.

	* cpplib.c (do_define): Switch bcopy to memcpy.
	Give cpp_pedwarn_with_file_and_line a dummy column argument.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index dafbe92e74e..3a6ea14d200 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -733,7 +733,7 @@ cpp_parse_expr (pfile)
       switch (op.op)
 	{
 	case NAME:
-	  cpp_fatal (pfile, "internal error: cpp_lex returns a NAME");
+	  cpp_ice (pfile, "cpp_lex returns a NAME");
 	  goto syntax_error;
 	case INT:  case CHAR:
 	  top->value = op.value;
@@ -1020,7 +1020,7 @@ cpp_parse_expr (pfile)
       if (op.op == 0)
 	{
 	  if (top != stack)
-	    cpp_error (pfile, "internal error in #if expression");
+	    cpp_ice (pfile, "unbalanced stack in #if expression");
 	  if (stack != init_stack)
 	    free (stack);
 	  return top->value;