X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/02650b7f0e3ef470a949768bdb907183da4b3beb..0f664b89d4aa86146015acd87a770db878d7e5d4:/src/system.h?ds=sidebyside
diff --git a/src/system.h b/src/system.h
index 63157904..57a432d0 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,12 +1,12 @@
/* System-dependent definitions for Bison.
- Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
+ 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
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#ifndef BISON_SYSTEM_H
#define BISON_SYSTEM_H
@@ -41,41 +40,27 @@
#include
#include
-#include "unlocked-io.h"
-
#if HAVE_SYS_TYPES_H
# include
#endif
-#if HAVE_UNISTD_H
-# include
-#endif
-
-#if HAVE_INTTYPES_H
-# include
-#endif
-#if HAVE_STDINT_H
-# include
-#endif
+#include
+#include
-#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
-#include
-#include
-
-
-/*---------------------.
-| Missing prototypes. |
-`---------------------*/
-#include
+/*---------.
+| Gnulib. |
+`---------*/
-/* From lib/basename.c. */
-char *base_name (char const *name);
+#include
+#include
+#include
/*-----------------.
@@ -113,6 +98,8 @@ char *base_name (char const *name);
# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
#endif
+#define FUNCTION_PRINT() fprintf (stderr, "%s: ", __func__)
+
/*------.
| NLS. |
`------*/
@@ -124,15 +111,6 @@ char *base_name (char const *name);
#define N_(Msgid) (Msgid)
-/*-------------------------------.
-| Fix broken compilation flags. |
-`-------------------------------*/
-
-#ifndef LOCALEDIR
-# define LOCALEDIR "/usr/local/share/locale"
-#endif
-
-
/*-----------.
| Booleans. |
`-----------*/
@@ -140,6 +118,21 @@ char *base_name (char const *name);
#include
+
+/*-------------.
+| Assertions. |
+`-------------*/
+
+/* '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. |
`-----------*/
@@ -214,11 +207,6 @@ do { \
} while (0)
-/* Assertions. 's assertions are too heavyweight, and can
- be disabled too easily, so implement it separately here. */
-#define assert(x) ((void) ((x) || (abort (), 0)))
-
-
/*---------------------------------------------.
| Debugging memory allocation (must be last). |
`---------------------------------------------*/