remove K&R C support from complain.c, system.h, calc.at, conflicts.at

[Paul Eggert]

I installed this patch to remove K&R C support from four other Bison
files.  This patch also removes one redundant macro defn.

2004-04-27  Paul Eggert  <address@hidden>

        * src/complain.c (vfprintf, strerror): Remove.
        * src/system.h: Include limits.h, stdlib.h, string.h, locale.h
        unconditionally.
        (EXIT_FAILURE, EXIT_SUCCESS, setlocale): Remove defns.
        Use latest Autoconf recommendations for including inttypes.h, stdint.h.
        (strchr, strspn, memchr): Remove decls.
        * tests/calc.at (_AT_DATA_CALC_Y): Include stdlib.h, string.h
        unconditionally.  Do not declare perror.
        * tests/conflicts.at (%nonassoc and eof): Include stdlib.h
        unconditionally.

Index: src/complain.c
===================================================================
RCS file: /cvsroot/bison/bison/src/complain.c,v
retrieving revision 1.20
diff -p -u -r1.20 complain.c
--- src/complain.c      29 Dec 2002 01:22:30 -0000      1.20
+++ src/complain.c      28 Apr 2004 06:48:24 -0000
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function for Bison.
-   Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2004 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
@@ -22,41 +22,13 @@
 #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"
 
-#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;
-
-#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;
Index: src/system.h
===================================================================
RCS file: /cvsroot/bison/bison/src/system.h,v
retrieving revision 1.61
diff -p -u -r1.61 system.h
--- src/system.h        12 Mar 2003 23:08:11 -0000      1.61
+++ src/system.h        28 Apr 2004 06:48:24 -0000
@@ -1,6 +1,6 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004 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
@@ -23,8 +23,11 @@
 # include <config.h>
 #endif
 
+#include <limits.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}
@@ -33,48 +36,18 @@
 # include <sys/types.h>
 #endif
 
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
-/* The following test is to work around the gross typo in
-   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
-   is defined to 0, not 1.  */
-#if !EXIT_FAILURE
-# undef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
-
-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
-#endif
-
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
-#  include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems.  */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
-
-#include <limits.h>
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
-#if HAVE_UINTPTR_T
-# if HAVE_INTTYPES_H
-#  include <inttypes.h>
-# else
-#  if HAVE_STDINT_H
-#   include <stdint.h>
-#  endif
-# endif
-#else
+#if ! HAVE_UINTPTR_T
 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
@@ -97,22 +70,10 @@ char *xstrndup (const char *str, size_t 
 char *stpcpy (char *dest, const char *src);
 #endif
 
-#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR
-char *strchr (const char *str, int ch);
-#endif
-
-#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
-size_t strspn (const char *str, const char *accept);
-#endif
-
 #if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
 size_t strnlen (const char *str, size_t maxlen);
 #endif
 
-#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
-void *memchr (const void *str, int ch, size_t size);
-#endif
-
 #if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
 void *memrchr (const void *str, int ch, size_t size);
 #endif
@@ -158,12 +119,7 @@ void *memrchr (const void *str, int ch, 
 | NLS.  |
 `------*/
 
-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale)
-#endif
+#include <locale.h>
 
 #include <gettext.h>
 #define _(Msgid)  gettext (Msgid)
Index: tests/calc.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/calc.at,v
retrieving revision 1.59
diff -p -u -r1.59 calc.at
--- tests/calc.at       25 Aug 2003 08:06:17 -0000      1.59
+++ tests/calc.at       28 Apr 2004 06:48:25 -0000
@@ -1,5 +1,5 @@
 # Simple calculator.                         -*- Autotest -*-
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 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
@@ -41,10 +41,8 @@ AT_DATA_GRAMMAR([calc.y],
 %{
 #include <stdio.h>
 
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#endif
+#include <stdlib.h>
+#include <string.h>
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #else
@@ -52,8 +50,6 @@ AT_DATA_GRAMMAR([calc.y],
 # define alarm(seconds) /* empty */
 #endif
 #include <ctype.h>
-
-extern void perror (const char *s);
 
 /* Exercise pre-prologue dependency to %union.  */
 typedef int semantic_value;
Index: tests/conflicts.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/conflicts.at,v
retrieving revision 1.27
diff -p -u -r1.27 conflicts.at
--- tests/conflicts.at  1 Oct 2003 21:33:24 -0000       1.27
+++ tests/conflicts.at  28 Apr 2004 06:48:25 -0000
@@ -1,6 +1,6 @@
 # Exercising Bison on conflicts.                         -*- Autotest -*-
 
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 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
@@ -55,10 +55,7 @@ AT_DATA_GRAMMAR([input.y],
 [[
 %{
 #include <stdio.h>
-
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #define YYERROR_VERBOSE 1
 static void