More ignores.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index 04b82ad073ff781995f041e98a399c46fa50ea94..620e726c30bae4cb13fef6b9e117b245894484c5 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
 /* Declaration for error-reporting function for Bison.

-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright 2000 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


@@ -19,14 +19,10 @@
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
+#include "system.h"

 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC

-# if __STDC__
+# ifdef __STDC__

 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else
 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else


@@ -47,18 +43,62 @@ void exit ();
 
 #include "complain.h"
 
 
 #include "complain.h"
 

+#ifndef HAVE_DECL_STRERROR_R
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_STRERROR_R
+char *strerror_r ();
+#endif
+

 #ifndef _
 # define _(String) String
 #endif
 
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */
 #ifndef _
 # define _(String) String
 #endif
 
 #ifdef _LIBC
 /* In the GNU C library, there is a predefined variable for this.  */

+

 # define program_name program_invocation_name
 # define program_name program_invocation_name

+# include <errno.h>
+
+/* In GNU libc we want do not want to use the common name `error' directly.
+   Instead make it a weak alias.  */
+# define error __error
+# define error_at_line __error_at_line
+
+# ifdef USE_IN_LIBIO
+#  include <libio/iolibio.h>
+#  define fflush(s) _IO_fflush (s)
+# endif
+

 #else /* not _LIBC */
 #else /* not _LIBC */

+

 /* 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;

-#endif
+
+# ifdef HAVE_STRERROR_R
+#  define __strerror_r strerror_r
+# else
+#  if HAVE_STRERROR
+#   ifndef strerror            /* On some systems, strerror is a macro */
+char *strerror ();
+#   endif
+#  else
+static char *
+private_strerror (errnum)
+     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 */
+# endif        /* HAVE_STRERROR_R */
+#endif /* not _LIBC */

 
 /* This variable is incremented each time `warn' is called.  */
 unsigned int warn_message_count;
 
 /* This variable is incremented each time `warn' is called.  */
 unsigned int warn_message_count;


@@ -75,7 +115,7 @@ int error_one_per_line;
 `--------------------------------*/
 
 void
 `--------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 warn (const char *message, ...)
 #else
 warn (message, va_alist)
 warn (const char *message, ...)
 #else
 warn (message, va_alist)


@@ -127,7 +167,7 @@ warn (message, va_alist)
 `-----------------------------------------------------------*/
 
 void
 `-----------------------------------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 complain (const char *message, ...)
 #else
 complain (message, va_alist)
 complain (const char *message, ...)
 #else
 complain (message, va_alist)


@@ -177,7 +217,7 @@ complain (message, va_alist)
 `-------------------------------------------------*/
 
 void
 `-------------------------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 fatal (const char *message, ...)
 #else
 fatal (message, va_alist)
 fatal (const char *message, ...)
 #else
 fatal (message, va_alist)


@@ -215,7 +255,7 @@ fatal (message, va_alist)
 `------------------------------------------------------------------*/
 
 void
 `------------------------------------------------------------------*/
 
 void

-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__

 error (int status, int errnum,
        const char *message, ...)
 #else
 error (int status, int errnum,
        const char *message, ...)
 #else