(nullable_compute): Use abort rather than assert.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 18b1377992e7b102fcc98f7f7f14a58d0930bf2c..e297f608cacdde8aa4401339e94a6c2599f16128 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -18,7 +18,7 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -43,6 +43,10 @@ char *alloca ();
 
 #include <assert.h>
 
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
@@ -75,32 +79,12 @@ char *alloca ();
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef SHRT_MIN
-# define SHRT_MIN (-32768)
-#endif
-#ifndef SHRT_MAX
-# define SHRT_MAX 32767
-#endif
+#include <limits.h>
 
 # include "xalloc.h"
 
 /* From xstrndup.c.  */
-char *xstrndup PARAMS ((const char *s, size_t n));
+char *xstrndup (const char *s, size_t n);
 
 
 /*----------------.
@@ -115,28 +99,28 @@ extern int time_report;
 | Missing prototypes.  |
 `---------------------*/
 
-#if !HAVE_DECL_STPCPY
-char *stpcpy PARAMS ((char *dest, const char *src));
+#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY
+char *stpcpy (char *dest, const char *src);
 #endif
 
-#if !HAVE_DECL_STRCHR
-char *strchr(const char *s, int c);
+#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR
+char *strchr (const char *s, int c);
 #endif
 
-#if !HAVE_DECL_STRSPN
-size_t strspn(const char *s, const char *accept);
+#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
+size_t strspn (const char *s, const char *accept);
 #endif
 
-#if !HAVE_DECL_STRNLEN
-size_t strnlen PARAMS ((const char *s, size_t maxlen));
+#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
+size_t strnlen (const char *s, size_t maxlen);
 #endif
 
-#if !HAVE_DECL_MEMCHR
-void *memchr PARAMS ((const void *s, int c, size_t n));
+#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
+void *memchr (const void *s, int c, size_t n);
 #endif
 
-#if !HAVE_DECL_MEMRCHR
-void *memrchr PARAMS ((const void *s, int c, size_t n));
+#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
+void *memrchr (const void *s, int c, size_t n);
 #endif
 
 
@@ -145,6 +129,14 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 | GCC extensions.  |
 `-----------------*/
 
+/* Use this to suppress gcc's `...may be used before initialized'
+   warnings.  */
+#ifdef lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \
@@ -172,10 +164,10 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 | NLS.  |
 `------*/
 
-#ifdef HAVE_LOCALE_H
+#if HAVE_LOCALE_H
 # include <locale.h>
 #endif
-#ifndef HAVE_SETLOCALE
+#if !HAVE_SETLOCALE
 # define setlocale(Category, Locale)
 #endif
 
@@ -197,11 +189,11 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 | Booleans.  |
 `-----------*/
 
-#ifndef TRUE
-# define TRUE  (1)
-# define FALSE (0)
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+typedef enum {false = 0, true = 1} bool;
 #endif
-typedef int bool;
 
 
 /*-----------.