* src/system.h: Include sys/types.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 8cd8bba1913a9447fdd8c9336621e2d4d8a3c994..3dcd007b038bab8331bd7fc8370b361ee7276e22 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, 2001, 2002  Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002 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


@@ -22,10 +22,31 @@
 # include <config.h>
 #endif
 
 # include <config.h>
 #endif
 

+/* AIX requires this to be the first thing in the file.  */
+#ifdef __GNUC__
+# define alloca(Size) __builtin_alloca (Size)
+#else
+# 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
+

 #include <stdio.h>
 
 #include <assert.h>
 
 #include <stdio.h>
 
 #include <assert.h>
 

+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+

 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif


@@ -57,79 +78,53 @@
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 
 /* memory.h and strings.h conflict on some systems.  */
 #endif /* not STDC_HEADERS and not HAVE_STRING_H */
 

-#if defined(STDC_HEADERS) || defined(HAVE_CTYPE_H)
-# include <ctype.h>
-#endif
-

 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 
 #include <errno.h>
 #ifndef errno
 extern int errno;
 #endif
 

-/* 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
-
-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-#ifndef SHRT_MIN
-# define SHRT_MIN (-32768)
-#endif
-#ifndef SHRT_MAX
-# define SHRT_MAX 32767
-#endif
+#include <limits.h>

 
 # include "xalloc.h"
 
 /* From xstrndup.c.  */
 
 # include "xalloc.h"
 
 /* From xstrndup.c.  */

-char *xstrndup PARAMS ((const char *s, size_t n));
+char *xstrndup (const char *s, size_t n);
+
+
+/*----------------.
+| Using timevar.  |
+`----------------*/
+
+#include "timevar.h"
+extern int time_report;
+

 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 
 #if !HAVE_DECL_STPCPY
 
 /*---------------------.
 | Missing prototypes.  |
 `---------------------*/
 
 #if !HAVE_DECL_STPCPY

-char *stpcpy PARAMS ((char *dest, const char *src));
+char *stpcpy (char *dest, const char *src);

 #endif
 
 #if !HAVE_DECL_STRCHR
 #endif
 
 #if !HAVE_DECL_STRCHR

-char *strchr(const char *s, int c);
+char *strchr (const char *s, int c);

 #endif
 
 #if !HAVE_DECL_STRSPN
 #endif
 
 #if !HAVE_DECL_STRSPN

-size_t strspn(const char *s, const char *accept);
+size_t strspn (const char *s, const char *accept);

 #endif
 
 #if !HAVE_DECL_STRNLEN
 #endif
 
 #if !HAVE_DECL_STRNLEN

-size_t strnlen PARAMS ((const char *s, size_t maxlen));
+size_t strnlen (const char *s, size_t maxlen);

 #endif
 
 #if !HAVE_DECL_MEMCHR
 #endif
 
 #if !HAVE_DECL_MEMCHR

-void *memchr PARAMS ((const void *s, int c, size_t n));
+void *memchr (const void *s, int c, size_t n);

 #endif
 
 #if !HAVE_DECL_MEMRCHR
 #endif
 
 #if !HAVE_DECL_MEMRCHR

-void *memrchr PARAMS ((const void *s, int c, size_t n));
+void *memrchr (const void *s, int c, size_t n);

 #endif
 
 
 #endif
 
 


@@ -144,14 +139,22 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif
 (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
 #  define __attribute__(Spec) /* empty */
 # endif

+#endif
+

 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
-# endif
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __format__ format
+# define __printf__ printf

 #endif
 
 #endif
 

+#ifndef ATTRIBUTE_NORETURN
+# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif
+
+#ifndef ATTRIBUTE_UNUSED
+# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#endif

 
 /*------.
 | NLS.  |
 
 /*------.
 | NLS.  |


@@ -182,11 +185,11 @@ void *memrchr PARAMS ((const void *s, int c, size_t n));
 | Booleans.  |
 `-----------*/
 
 | Booleans.  |
 `-----------*/
 

-#ifndef TRUE
-# define TRUE  (1)
-# define FALSE (0)
+#if HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+typedef enum {false = 0, true = 1} bool;

 #endif
 #endif

-typedef int bool;

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