Change identifier spellings to avoid collisions with names

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index e297f608cacdde8aa4401339e94a6c2599f16128..50149c98b1c5481fc3efc8fd4f5f6f2b87308518 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,4 +1,4 @@
-/* system-dependent definitions for Bison.
+/* System-dependent definitions for Bison.
    Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,8 @@ char *alloca ();
 
 #include <stdio.h>
 
-#include <assert.h>
+/* Verify a requirement at compile-time (unlike assert, which is runtime).  */
+#define verify(name, assertion) struct name {char name[(assertion) ? 1 : -1];}
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>
@@ -78,23 +79,14 @@ char *alloca ();
 /* 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"
+#include <xalloc.h>
 
 /* From xstrndup.c.  */
 char *xstrndup (const char *s, size_t n);
 
 
-/*----------------.
-| Using timevar.  |
-`----------------*/
-
-#include "timevar.h"
-extern int time_report;
-
-
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
@@ -171,7 +163,7 @@ void *memrchr (const void *s, int c, size_t n);
 # define setlocale(Category, Locale)
 #endif
 
-#include "gettext.h"
+#include <gettext.h>
 #define _(Msgid)  gettext (Msgid)
 #define N_(Msgid) (Msgid)
 
@@ -202,7 +194,7 @@ typedef enum {false = 0, true = 1} bool;
 
 # 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))
@@ -243,17 +235,17 @@ do {                                                              \
 
 #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. */
-#  define EXT_TAB      "_tab"
-#  define EXT_OUTPUT   ".out"
+#  define TAB_EXT      "_tab"
+#  define OUTPUT_EXT   ".out"
 # else /* ! MSDOS */
   /* Standard. */
-#  define EXT_TAB      ".tab"
-#  define EXT_OUTPUT   ".output"
+#  define TAB_EXT      ".tab"
+#  define OUTPUT_EXT   ".output"
 # endif /* ! MSDOS */
 #endif /* ! VMS */