From 6e26ca8c273070fed47c986a96ffc9ed21d9bb17 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 28 Apr 2004 06:52:51 +0000 Subject: [PATCH] Remove more K&R C support. --- src/complain.c | 30 +------------------- src/system.h | 68 ++++++++-------------------------------------- tests/calc.at | 10 ++----- tests/conflicts.at | 7 ++--- 4 files changed, 18 insertions(+), 97 deletions(-) diff --git a/src/complain.c b/src/complain.c index e14f40b6..8a192bd2 100644 --- a/src/complain.c +++ b/src/complain.c @@ -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,42 +22,14 @@ #include "system.h" #include -#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; diff --git a/src/system.h b/src/system.h index a1fee01c..d0a634dc 100644 --- a/src/system.h +++ b/src/system.h @@ -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 #endif +#include #include #include +#include +#include /* 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 #endif -#if HAVE_STDLIB_H -# include -#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 #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include -/* An ANSI string.h and pre-ANSI memory.h might conflict. */ -# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -# endif /* not STDC_HEADERS and HAVE_MEMORY_H */ -#else /* not STDC_HEADERS and not HAVE_STRING_H */ -# include -/* memory.h and strings.h conflict on some systems. */ -#endif /* not STDC_HEADERS and not HAVE_STRING_H */ - -#include +#if HAVE_INTTYPES_H +# include +#endif +#if HAVE_STDINT_H +# include +#endif -#if HAVE_UINTPTR_T -# if HAVE_INTTYPES_H -# include -# else -# if HAVE_STDINT_H -# include -# 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 size); 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, size_t size); | NLS. | `------*/ -#if HAVE_LOCALE_H -# include -#endif -#if !HAVE_SETLOCALE -# define setlocale(Category, Locale) -#endif +#include #include #define _(Msgid) gettext (Msgid) diff --git a/tests/calc.at b/tests/calc.at index 26dcf860..b2f85783 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -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 -#if STDC_HEADERS -# include -# include -#endif +#include +#include #if HAVE_UNISTD_H # include #else @@ -53,8 +51,6 @@ AT_DATA_GRAMMAR([calc.y], #endif #include -extern void perror (const char *s); - /* Exercise pre-prologue dependency to %union. */ typedef int semantic_value; diff --git a/tests/conflicts.at b/tests/conflicts.at index 25885d5c..381b49ef 100644 --- a/tests/conflicts.at +++ b/tests/conflicts.at @@ -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 - -#if STDC_HEADERS -# include -#endif +#include #define YYERROR_VERBOSE 1 static void -- 2.47.2