Fix some porting glitches found by Nelson H. F. Beebe.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 10abfef590786f47bde47b9f380d2aa645d1c3ca..c1c45b49f2d57ff95ffff20a863c8c78c6d3b2a0 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,7 @@
 /* System-dependent definitions for Bison.
 
-   Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 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
@@ -14,23 +15,33 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #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>
 #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];}
+#include "unlocked-io.h"
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -53,10 +64,10 @@
 typedef size_t uintptr_t;
 #endif
 
+#include <assert.h>
+
+#include <verify.h>
 #include <xalloc.h>
-#define CALLOC(P, N) ((P) = xcalloc (N, sizeof *(P)))
-#define MALLOC(P, N) ((P) = xnmalloc (N, sizeof *(P)))
-#define REALLOC(P, N) ((P) = xnrealloc (P, N, sizeof *(P)))
 
 
 /*---------------------.
@@ -65,6 +76,9 @@ typedef size_t uintptr_t;
 
 #include <stpcpy.h>
 
+/* From lib/basename.c. */
+char *base_name (char const *name);
+
 
 /*-----------------.
 | GCC extensions.  |
@@ -132,9 +146,9 @@ typedef size_t uintptr_t;
 | Obstacks.  |
 `-----------*/
 
-# define obstack_chunk_alloc xmalloc
-# define obstack_chunk_free  free
-# include <obstack.h>
+#define obstack_chunk_alloc xmalloc
+#define obstack_chunk_free  free
+#include <obstack.h>
 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
@@ -173,21 +187,13 @@ do {                                                              \
 | Extensions to use for the output files.  |
 `-----------------------------------------*/
 
-#ifdef VMS
-  /* VMS. */
-# define TAB_EXT       "_tab"
-# define OUTPUT_EXT    ".output"
-#else /* ! VMS */
-# ifdef MSDOS
-   /* MS DOS. */
-#  define TAB_EXT      "_tab"
-#  define OUTPUT_EXT   ".out"
-# else /* ! MSDOS */
-  /* Standard. */
-#  define TAB_EXT      ".tab"
-#  define OUTPUT_EXT   ".output"
-# endif /* ! MSDOS */
-#endif /* ! VMS */
+#ifndef OUTPUT_EXT
+# define OUTPUT_EXT ".output"
+#endif
+
+#ifndef TAB_EXT
+# define TAB_EXT ".tab"
+#endif
 
 #ifndef DEFAULT_TMPDIR
 # define DEFAULT_TMPDIR "/tmp"