Use ASCII for Sebastien Fricker's name.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 369218cd0b82f7af5aef92710615067d7dcd8cc4..985bbbeed46349fc647588596e95d03df8418a67 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,7 +1,7 @@
 /* System-dependent definitions for Bison.
 
 /* System-dependent definitions for Bison.
 

-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 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
 
    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


@@ -20,8 +20,20 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 

-#if HAVE_CONFIG_H
-# include <config.h>
+/* flex 2.5.31 gratutiously defines macros like INT8_MIN.  But this
+   runs afoul of pre-C99 compilers that have <inttypes.h> or
+   <stdint.h>, which are included below if available.  It also runs
+   afoul of pre-C99 compilers that define these macros in <limits.h>.  */
+#if ! defined __STDC_VERSION__ || __STDC_VERSION__ < 199901
+# undef INT8_MIN
+# undef INT16_MIN
+# undef INT32_MIN
+# undef INT8_MAX
+# undef INT16_MAX
+# undef UINT8_MAX
+# undef INT32_MAX
+# undef UINT16_MAX
+# undef UINT32_MAX

 #endif
 
 #include <limits.h>
 #endif
 
 #include <limits.h>


@@ -29,45 +41,29 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "unlocked-io.h"
-

 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 

-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <unistd.h>
+#include <inttypes.h>

 
 

-#if ! HAVE_UINTPTR_T
+#ifndef UINTPTR_MAX

 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
 #endif
 
 /* This isn't perfect, but it's good enough for Bison, which needs
    only to hash pointers.  */
 typedef size_t uintptr_t;
 #endif
 

-#include <assert.h>

 
 

+/*---------.
+| Gnulib.  |
+`---------*/
+
+#include <unlocked-io.h>

 #include <verify.h>
 #include <xalloc.h>
 
 
 #include <verify.h>
 #include <xalloc.h>
 
 

-/*---------------------.
-| Missing prototypes.  |
-`---------------------*/
-
-#include <stpcpy.h>
-
-/* From lib/basename.c. */
-char *base_name (char const *name);
-
-

 /*-----------------.
 | GCC extensions.  |
 `-----------------*/
 /*-----------------.
 | GCC extensions.  |
 `-----------------*/


@@ -82,8 +78,8 @@ char *base_name (char const *name);
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */

-# if !defined (__GNUC__) || __GNUC__ < 2 || \
-(__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if (! defined __GNUC__ || __GNUC__ < 2 \
+      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__)

 #  define __attribute__(Spec) /* empty */
 # endif
 #endif
 #  define __attribute__(Spec) /* empty */
 # endif
 #endif


@@ -103,6 +99,8 @@ char *base_name (char const *name);
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
 # define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 

+#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
+

 /*------.
 | NLS.  |
 `------*/
 /*------.
 | NLS.  |
 `------*/


@@ -114,15 +112,6 @@ char *base_name (char const *name);
 #define N_(Msgid) (Msgid)
 
 
 #define N_(Msgid) (Msgid)
 
 

-/*-------------------------------.
-| Fix broken compilation flags.  |
-`-------------------------------*/
-
-#ifndef LOCALEDIR
-# define LOCALEDIR "/usr/local/share/locale"
-#endif
-
-

 /*-----------.
 | Booleans.  |
 `-----------*/
 /*-----------.
 | Booleans.  |
 `-----------*/


@@ -130,6 +119,21 @@ char *base_name (char const *name);
 #include <stdbool.h>
 
 
 #include <stdbool.h>
 
 

+
+/*-------------.
+| Assertions.  |
+`-------------*/
+
+/* <assert.h>'s assertions are too heavyweight, and can be disabled
+   too easily, so use aver rather than assert.  */
+static inline void
+aver (bool assertion)
+{
+  if (! assertion)
+    abort ();
+}
+
+

 /*-----------.
 | Obstacks.  |
 `-----------*/
 /*-----------.
 | Obstacks.  |
 `-----------*/