Fix the previous test.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index f57247897e84dc15c12e301de369472de53d58a6..392f4eec49df9bac1c1473cd6accdd3da8312923 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* system-dependent definitions for Bison.
 /* system-dependent definitions for Bison.

-   Copyright 2000 Free Software Foundation, Inc.
+   Copyright 2000, 2001  Free Software Foundation, Inc.

 
    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
 
    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


@@ -26,18 +26,20 @@
 
 #include <assert.h>
 
 
 #include <assert.h>
 

-#ifdef MSDOS
-# include <io.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>

 #endif
 
 #endif
 

-#ifdef _MSC_VER
-# include <stdlib.h>
-# include <process.h>
-# define getpid _getpid
+/* The following test is to work around the gross typo in
+   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
+   is defined to 0, not 1.  */
+#if !EXIT_FAILURE
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1

 #endif
 
 #endif
 

-#if HAVE_STDLIB_H
-# include <stdlib.h>
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0

 #endif
 
 #if HAVE_UNISTD_H
 #endif
 
 #if HAVE_UNISTD_H


@@ -50,9 +52,6 @@
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */
 # if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
 #  include <memory.h>
 # endif /* not STDC_HEADERS and HAVE_MEMORY_H */

-# ifndef bcopy
-#  define bcopy(src, dst, num) memcpy((dst), (src), (num))
-# endif

 #else /* not STDC_HEADERS and not HAVE_STRING_H */
 # include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */
 #else /* not STDC_HEADERS and not HAVE_STRING_H */
 # include <strings.h>
 /* memory.h and strings.h conflict on some systems.  */


@@ -67,13 +66,33 @@
 extern int errno;
 #endif
 
 extern int errno;
 #endif
 

-#if PROTOTYPES
-# define PARAMS(p) p
-#else
-# define PARAMS(p) ()
+/* AIX requires this to be the first thing in the file.  */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
+#endif
+
+#ifndef PARAMS
+# if defined PROTOTYPES || defined __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif

 #endif
 
 #endif
 

+# include "xalloc.h"

 
 

+/* From xstrndup.c.  */
+char *xstrndup PARAMS ((const char *s, size_t n));

 
 /*---------------------.
 | Missing prototypes.  |
 
 /*---------------------.
 | Missing prototypes.  |


@@ -83,14 +102,30 @@ extern int errno;
 char *stpcpy PARAMS ((char *dest, const char *src));
 #endif
 
 char *stpcpy PARAMS ((char *dest, const char *src));
 #endif
 

+#if !HAVE_DECL_STRCHR
+char *strchr(const char *s, int c);
+#endif
+

 #if !HAVE_DECL_STRNDUP
 char *strndup PARAMS ((const char *s, size_t size));
 #endif
 
 #if !HAVE_DECL_STRNDUP
 char *strndup PARAMS ((const char *s, size_t size));
 #endif
 

+#if !HAVE_DECL_STRSPN
+size_t strspn(const char *s, const char *accept);
+#endif
+

 #if !HAVE_DECL_STRNLEN
 size_t strnlen PARAMS ((const char *s, size_t maxlen));
 #endif
 
 #if !HAVE_DECL_STRNLEN
 size_t strnlen PARAMS ((const char *s, size_t maxlen));
 #endif
 

+#if !HAVE_DECL_MEMCHR
+void *memchr PARAMS ((const void *s, int c, size_t n));
+#endif
+
+#if !HAVE_DECL_MEMRCHR
+void *memrchr PARAMS ((const void *s, int c, size_t n));
+#endif
+

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


@@ -99,7 +134,8 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 
 #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 __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
 /* The __-protected variants of `format' and `printf' attributes
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes


@@ -122,17 +158,9 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define setlocale(Category, Locale)
 #endif
 
 # define setlocale(Category, Locale)
 #endif
 

-#ifdef ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# undef bindtextdomain
-# define bindtextdomain(Domain, Directory)
-# undef textdomain
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "libgettext.h"
+#define _(Msgid)  gettext (Msgid)
+#define N_(Msgid) (Msgid)

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


@@ -143,8 +171,6 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define LOCALEDIR "/usr/local/share/locale"
 #endif
 
 # define LOCALEDIR "/usr/local/share/locale"
 #endif
 

-#endif  /* BISON_SYSTEM_H */
-

 
 /*-----------.
 | Booleans.  |
 
 /*-----------.
 | Booleans.  |


@@ -161,9 +187,9 @@ typedef int bool;
 | Obstacks.  |
 `-----------*/
 
 | Obstacks.  |
 `-----------*/
 

-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free  free
-#include "obstack.h"
+# define obstack_chunk_alloc xmalloc
+# define obstack_chunk_free  free
+# include "obstack.h"

 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))
 
 #define obstack_sgrow(Obs, Str) \
   obstack_grow (Obs, Str, strlen (Str))


@@ -247,20 +273,28 @@ do {                                                              \
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 
 # endif /* ! MSDOS */
 #endif /* ! VMS */
 

-#if defined (VMS) & !defined (__VMS_POSIX)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "GNU_BISON:[000000]BISON.SIMPLE"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HARIRY "GNU_BISON:[000000]BISON.HAIRY"
-# endif
-#endif
+/* As memcpy, but for shorts.  */
+#define shortcpy(Dest, Src, Num) \
+  memcpy (Dest, Src, Num * sizeof (short))

 
 

-#if defined (_MSC_VER)
-# ifndef BISON_SIMPLE
-#  define BISON_SIMPLE "c:/usr/local/lib/bison.simple"
-# endif
-# ifndef BISON_HAIRY
-#  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
-# endif
-#endif
+/* Free a linked list. */
+#define LIST_FREE(Type, List)                  \
+do {                                           \
+  Type *_node, *_next;                         \
+  for (_node = List; _node; _node = _next)     \
+    {                                          \
+      _next = _node->next;                     \
+      XFREE (_node);                           \
+    }                                          \
+} while (0)
+
+/*---------------------------------.
+| Debugging the memory allocator.  |
+`---------------------------------*/
+
+# if WITH_DMALLOC
+#  define DMALLOC_FUNC_CHECK
+#  include <dmalloc.h>
+# endif /* WITH_DMALLOC */
+
+#endif  /* ! BISON_SYSTEM_H */