Various DJGGP specific issues in /djgpp.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 8d3004bb7168cb2c832d88e3e457d71dc89edeaf..927dbb6305a183c836daf1e0c503c062e31e1b18 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the


@@ -13,51 +14,24 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,

    USA.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
    USA.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 

+#include <config.h>

 #include "system.h"
 
 #include <stdarg.h>
 #include "system.h"
 
 #include <stdarg.h>

-#if ! (HAVE_VPRINTF || defined vfprintf)
-# define vfprintf(stream, message, args) _doprnt (message, args, stream)
-#endif

 
 #include "complain.h"
 #include "files.h"
 
 
 #include "complain.h"
 #include "files.h"
 

-#ifndef _
-# define _(String) String
-#endif
-

 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 
 /* The calling program should define program_name and set it to the
    name of the executing program.  */
 extern char *program_name;
 

-#if HAVE_STRERROR
-# ifndef HAVE_DECL_STRERROR
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRERROR && !defined strerror
-char *strerror (int);
-# endif
-#else
-static char *
-private_strerror (int errnum)
-{
-  extern char *sys_errlist[];
-  extern int sys_nerr;
-
-  if (errnum > 0 && errnum <= sys_nerr)
-    return _(sys_errlist[errnum]);
-  return _("Unknown system error");
-}
-# define strerror private_strerror
-#endif /* HAVE_STRERROR */
-

 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
 
 /* This variable is set each time `warn' is called.  */
 bool warning_issued;
 


@@ -74,7 +48,6 @@ warn_at (location loc, const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("warning: "), stderr);
   location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("warning: "), stderr);


@@ -85,7 +58,6 @@ warn_at (location loc, const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
 
   warning_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 
 void
 }
 
 void


@@ -93,7 +65,6 @@ warn (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
 
   va_start (args, message);
   fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: "));
 
   va_start (args, message);


@@ -102,7 +73,6 @@ warn (const char *message, ...)
 
   warning_issued = true;
   putc ('\n', stderr);
 
   warning_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 \f
 /*-----------------------------------------------------------.
 }
 \f
 /*-----------------------------------------------------------.


@@ -114,7 +84,6 @@ complain_at (location loc, const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   location_print (stderr, loc);
   fputs (": ", stderr);
 
   location_print (stderr, loc);
   fputs (": ", stderr);
 


@@ -124,7 +93,6 @@ complain_at (location loc, const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
 
   complaint_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 
 void
 }
 
 void


@@ -132,7 +100,6 @@ complain (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   va_start (args, message);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   va_start (args, message);


@@ -141,7 +108,6 @@ complain (const char *message, ...)
 
   complaint_issued = true;
   putc ('\n', stderr);
 
   complaint_issued = true;
   putc ('\n', stderr);

-  fflush (stderr);

 }
 \f
 /*-------------------------------------------------.
 }
 \f
 /*-------------------------------------------------.


@@ -153,7 +119,6 @@ fatal_at (location loc, const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);
   location_print (stderr, loc);
   fputs (": ", stderr);
   fputs (_("fatal error: "), stderr);


@@ -162,7 +127,6 @@ fatal_at (location loc, const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);

-  fflush (stderr);

   exit (EXIT_FAILURE);
 }
 
   exit (EXIT_FAILURE);
 }
 


@@ -171,7 +135,6 @@ fatal (const char *message, ...)
 {
   va_list args;
 
 {
   va_list args;
 

-  fflush (stdout);

   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   fputs (_("fatal error: "), stderr);
   fprintf (stderr, "%s: ", current_file ? current_file : program_name);
 
   fputs (_("fatal error: "), stderr);


@@ -180,6 +143,5 @@ fatal (const char *message, ...)
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);
   vfprintf (stderr, message, args);
   va_end (args);
   putc ('\n', stderr);

-  fflush (stderr);

   exit (EXIT_FAILURE);
 }
   exit (EXIT_FAILURE);
 }