Rename struniq to uniqstr, to avoid collision with <string.h>.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 3dcd007b038bab8331bd7fc8370b361ee7276e22..1b2459e03028255e0d83b761c80139920b42781a 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
    Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify


@@ -18,7 +18,7 @@
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 
 #ifndef BISON_SYSTEM_H
 #define BISON_SYSTEM_H
 

-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H

 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 


@@ -41,7 +41,8 @@ char *alloca ();
 
 #include <stdio.h>
 
 
 #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>
 
 #if HAVE_SYS_TYPES_H
 # include <sys/types.h>


@@ -79,10 +80,6 @@ char *alloca ();
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 #include <errno.h>
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 #include <errno.h>

-#ifndef errno
-extern int errno;
-#endif
-

 #include <limits.h>
 
 # include "xalloc.h"
 #include <limits.h>
 
 # include "xalloc.h"


@@ -103,27 +100,27 @@ extern int time_report;
 | Missing prototypes.  |
 `---------------------*/
 
 | Missing prototypes.  |
 `---------------------*/
 

-#if !HAVE_DECL_STPCPY
+#if defined HAVE_DECL_STPCPY && !HAVE_DECL_STPCPY

 char *stpcpy (char *dest, const char *src);
 #endif
 
 char *stpcpy (char *dest, const char *src);
 #endif
 

-#if !HAVE_DECL_STRCHR
+#if defined HAVE_DECL_STRCHR && !HAVE_DECL_STRCHR

 char *strchr (const char *s, int c);
 #endif
 
 char *strchr (const char *s, int c);
 #endif
 

-#if !HAVE_DECL_STRSPN
+#if defined HAVE_DECL_STRSPN && !HAVE_DECL_STRSPN

 size_t strspn (const char *s, const char *accept);
 #endif
 
 size_t strspn (const char *s, const char *accept);
 #endif
 

-#if !HAVE_DECL_STRNLEN
+#if defined HAVE_DECL_STRNLEN && !HAVE_DECL_STRNLEN

 size_t strnlen (const char *s, size_t maxlen);
 #endif
 
 size_t strnlen (const char *s, size_t maxlen);
 #endif
 

-#if !HAVE_DECL_MEMCHR
+#if defined HAVE_DECL_MEMCHR && !HAVE_DECL_MEMCHR

 void *memchr (const void *s, int c, size_t n);
 #endif
 
 void *memchr (const void *s, int c, size_t n);
 #endif
 

-#if !HAVE_DECL_MEMRCHR
+#if defined HAVE_DECL_MEMRCHR && !HAVE_DECL_MEMRCHR

 void *memrchr (const void *s, int c, size_t n);
 #endif
 
 void *memrchr (const void *s, int c, size_t n);
 #endif
 


@@ -133,6 +130,14 @@ void *memrchr (const void *s, int c, size_t n);
 | GCC extensions.  |
 `-----------------*/
 
 | GCC extensions.  |
 `-----------------*/
 

+/* Use this to suppress gcc's `...may be used before initialized'
+   warnings.  */
+#ifdef lint
+# define IF_LINT(Code) Code
+#else
+# define IF_LINT(Code) /* empty */
+#endif
+

 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 # if !defined (__GNUC__) || __GNUC__ < 2 || \


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

-#ifdef HAVE_LOCALE_H
+#if HAVE_LOCALE_H

 # include <locale.h>
 #endif
 # include <locale.h>
 #endif

-#ifndef HAVE_SETLOCALE
+#if !HAVE_SETLOCALE

 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif