X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/cb48f1919ce8ccbd8587556c165a8b8b0d78d80f..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/system.h?ds=sidebyside

diff --git a/src/system.h b/src/system.h
index 241a40d7..985bbbee 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,6 @@
 /* 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
@@ -45,15 +45,8 @@
 # include <sys/types.h>
 #endif
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-
-#include <stdint.h>
+#include <unistd.h>
+#include <inttypes.h>
 
 #ifndef UINTPTR_MAX
 /* This isn't perfect, but it's good enough for Bison, which needs
@@ -66,7 +59,6 @@ typedef size_t uintptr_t;
 | Gnulib.  |
 `---------*/
 
-#include <stpcpy.h>
 #include <unlocked-io.h>
 #include <verify.h>
 #include <xalloc.h>
@@ -120,15 +112,6 @@ typedef size_t uintptr_t;
 #define N_(Msgid) (Msgid)
 
 
-/*-------------------------------.
-| Fix broken compilation flags.  |
-`-------------------------------*/
-
-#ifndef LOCALEDIR
-# define LOCALEDIR "/usr/local/share/locale"
-#endif
-
-
 /*-----------.
 | Booleans.  |
 `-----------*/
@@ -136,6 +119,21 @@ typedef size_t uintptr_t;
 #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.  |
 `-----------*/
@@ -210,11 +208,6 @@ do {						\
 } while (0)
 
 
-/* Assertions.  <assert.h>'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).  |
 `---------------------------------------------*/