rtl.c: Revert NLS changes.

2000-06-29  Philipp Thomas  <pthomas@suse.de>

	* rtl.c : Revert NLS changes.
	* gcc.c : Fix bug in display_help introced by my last changes.

From-SVN: r34778

3 files changed, 14 insertions, 8 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60cfda0..a3d44c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-29  Philipp Thomas  <pthomas@suse.de>
+
+	* rtl.c : Revert NLS changes.
+	* gcc.c : Fix bug in display_help introced by my last changes.
+
 Wed Jun 28 21:09:33 2000   Raja R Harinath <harinath@cs.umn.edu>
 
 	* dbxout.c (dbxout_symbol, case RESULT_DECL, VAR_DECL): Use
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 696dbd0..894a405 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2846,10 +2846,11 @@ display_help ()
                            guessing the language based on the file's extension\n\
 "), stdout);
 
-  printf (_("\n\
-Options starting with -g, -f, -m, -O or -W are automatically passed on to\n\
+  printf (_("\
+\nOptions starting with -g, -f, -m, -O or -W are automatically passed on to\n\
 the various sub-processes invoked by %s.  In order to pass other options\n\
-on to these processes the -W<letter> options must be used.\n\"), programname);
+on to these processes the -W<letter> options must be used.\n\
+"), programname);
 
   /* The rest of the options are displayed by invocations of the various
      sub-processes.  */
diff --git a/gcc/rtl.c b/gcc/rtl.c
index cf88964..6c771f6 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -684,18 +684,18 @@ int read_rtx_lineno = 1;
 const char *read_rtx_filename = "<unknown>";
 
 static void
-fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
+fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msg, ...))
 {
 #ifndef ANSI_PROTOTYPES
   FILE *infile;
-  const char *msgid;
+  const char *msg;
 #endif
   va_list ap;
   char context[64];
   size_t i;
   int c;
 
-  VA_START (ap, msgid);
+  VA_START (ap, msg);
 
 #ifndef ANSI_PROTOTYPES
   infile = va_arg (ap, FILE *);
@@ -703,7 +703,7 @@ fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
 #endif
 
   fprintf (stderr, "%s:%d: ", read_rtx_filename, read_rtx_lineno);
-  vfprintf (stderr, _(msgid), ap);
+  vfprintf (stderr, msg, ap);
   putc ('\n', stderr);
 
   /* Gather some following context.  */
@@ -718,7 +718,7 @@ fatal_with_file_and_line VPARAMS ((FILE *infile, const char *msgid, ...))
     }
   context[i] = '\0';
 
-  fprintf (stderr, _("%s:%d: following context is `%s'\n"),
+  fprintf (stderr, "%s:%d: following context is `%s'\n",
 	   read_rtx_filename, read_rtx_lineno, context);
 
   va_end (ap);