Merge in branch-1_29.

[bison.git] / src / complain.c

diff --git a/src/complain.c b/src/complain.c
index b25f0b2993c364b8448bbb75eb3ad614481cce15..620e726c30bae4cb13fef6b9e117b245894484c5 100644 (file)
--- a/src/complain.c
+++ b/src/complain.c
@@ -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


@@ -119,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)


@@ -171,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)


@@ -221,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)


@@ -259,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