* configure.ac (AM_INIT_AUTOMAKE): We _need_ 1.7.

[bison.git] / src / system.h

diff --git a/src/system.h b/src/system.h
index 6250122a8342c36b9673388d556c1234a77b2d92..18b1377992e7b102fcc98f7f7f14a58d0930bf2c 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,6 +22,23 @@
 # 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>


@@ -57,30 +74,11 @@
 /* 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
 #ifndef PARAMS
 # if defined PROTOTYPES || defined __STDC__
 #  define PARAMS(Args) Args


@@ -104,16 +102,13 @@ char *alloca ();
 /* From xstrndup.c.  */
 char *xstrndup PARAMS ((const char *s, size_t n));
 
 /* From xstrndup.c.  */
 char *xstrndup PARAMS ((const char *s, size_t n));
 

-/* Finding `mallinfo' where available.  */
-#if HAVE_MALLOC_H
-# include <malloc.h>
-#endif

 
 

+/*----------------.
+| Using timevar.  |
+`----------------*/

 
 

-/* Find `times' where available.  */
-#if HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
+#include "timevar.h"
+extern int time_report;

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