* NEWS: Instead of %union, you can define and use your own union type

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index d6b45eeb908b973e5fcf00ab91b439772c463185..241a40d7f92e046c8749b11e0fb21ded68cdc92a 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -41,8 +41,6 @@
 #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


@@ -54,28 +52,24 @@
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif

-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif

 
 

-#if ! HAVE_UINTPTR_T
+#include <stdint.h>
+
+#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 <verify.h>
-#include <xalloc.h>
-

 
 

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

 
 #include <stpcpy.h>
 
 #include <stpcpy.h>

-
-/* From lib/basename.c. */
-char *base_name (char const *name);
+#include <unlocked-io.h>
+#include <verify.h>
+#include <xalloc.h>

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


@@ -92,8 +86,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


@@ -113,6 +107,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.  |
 `------*/