* data/lalr1.cc: Reinstall the former ctor, for sake of

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 1b2459e03028255e0d83b761c80139920b42781a..62640c5cc9280b693556b18cc31e2588139e14cd 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,6 @@
 /* System-dependent definitions for Bison.
 /* System-dependent definitions for Bison.

-   Copyright (C) 2000, 2001, 2002 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
 
    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


@@ -22,24 +23,11 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# define alloca(Size) __builtin_alloca (Size)
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
+#include <limits.h>
+#include <stddef.h>

 #include <stdio.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];}
 
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}


@@ -48,82 +36,34 @@ char *alloca ();
 # include <sys/types.h>
 #endif
 
 # include <sys/types.h>
 #endif
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>

 #endif
 
 #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
+#if HAVE_INTTYPES_H
+# include <inttypes.h>

 #endif
 #endif

-
-#ifndef EXIT_SUCCESS
-# define EXIT_SUCCESS 0
+#if HAVE_STDINT_H
+# include <stdint.h>

 #endif
 
 #endif
 

-#if HAVE_UNISTD_H
-# include <unistd.h>
+#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;

 #endif
 
 #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 <errno.h>
-#include <limits.h>
-
-# include "xalloc.h"
-
-/* From xstrndup.c.  */
-char *xstrndup (const char *s, size_t n);
-
-
-/*----------------.
-| Using timevar.  |
-`----------------*/
-
-#include "timevar.h"
-extern int time_report;
+#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)))

 
 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 
 
 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 

-#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY
-char *stpcpy (char *dest, const char *src);
-#endif
-
-#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR
-char *strchr (const char *s, int c);
-#endif
-
-#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN
-size_t strspn (const char *s, const char *accept);
-#endif
-
-#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN
-size_t strnlen (const char *s, size_t maxlen);
-#endif
-
-#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR
-void *memchr (const void *s, int c, size_t n);
-#endif
-
-#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR
-void *memrchr (const void *s, int c, size_t n);
-#endif
-
+#include <stpcpy.h>

 
 
 /*-----------------.
 
 
 /*-----------------.


@@ -165,14 +105,9 @@ void *memrchr (const void *s, int c, size_t n);
 | NLS.  |
 `------*/
 
 | NLS.  |
 `------*/
 

-#if HAVE_LOCALE_H
-# include <locale.h>
-#endif
-#if !HAVE_SETLOCALE
-# define setlocale(Category, Locale)
-#endif
+#include <locale.h>

 
 

-#include "gettext.h"
+#include <gettext.h>

 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 


@@ -190,11 +125,7 @@ void *memrchr (const void *s, int c, size_t n);
 | Booleans.  |
 `-----------*/
 
 | Booleans.  |
 `-----------*/
 

-#if HAVE_STDBOOL_H
-# include <stdbool.h>
-#else
-typedef enum {false = 0, true = 1} bool;
-#endif
+#include <stdbool.h>

 
 
 /*-----------.
 
 
 /*-----------.


@@ -203,7 +134,7 @@ typedef enum {false = 0, true = 1} bool;
 
 # define obstack_chunk_alloc xmalloc
 # define obstack_chunk_free  free
 
 # define obstack_chunk_alloc xmalloc
 # define obstack_chunk_free  free

-# include "obstack.h"
+# include <obstack.h>

 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))


@@ -244,17 +175,17 @@ do {                                                              \
 
 #ifdef VMS
   /* VMS. */
 
 #ifdef VMS
   /* VMS. */

-# define EXT_TAB       "_tab"
-# define EXT_OUTPUT    ".output"
+# define TAB_EXT       "_tab"
+# define OUTPUT_EXT    ".output"

 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */
 #else /* ! VMS */
 # ifdef MSDOS
    /* MS DOS. */

-#  define EXT_TAB      "_tab"
-#  define EXT_OUTPUT   ".out"
+#  define TAB_EXT      "_tab"
+#  define OUTPUT_EXT   ".out"

 # else /* ! MSDOS */
   /* Standard. */
 # else /* ! MSDOS */
   /* Standard. */

-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
+#  define TAB_EXT      ".tab"
+#  define OUTPUT_EXT   ".output"

 # endif /* ! MSDOS */
 #endif /* ! VMS */
 
 # endif /* ! MSDOS */
 #endif /* ! VMS */