diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2002-08-12 14:54:27 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2002-08-12 14:54:27 +0000 |
commit | 04c5cba26863f8704aeb0548a97c59717943739f (patch) | |
tree | 6319c21dd57117291a6e3b72185b9701a52c3b54 | |
parent | d7163c0a58fad051d90a6f83107c646c4408971c (diff) | |
download | bison-04c5cba26863f8704aeb0548a97c59717943739f.tar.gz |
(alloca): Use same pattern as ../lib/error.c.
Do not include <ctype.h>; no longer needed.
Do not include <malloc.h>; no longer needed (and generates
warnings on OpenBSD 3.0).
-rw-r--r-- | src/system.h | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/src/system.h b/src/system.h index 68e62802..18b13779 100644 --- a/src/system.h +++ b/src/system.h @@ -1,5 +1,5 @@ /* 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 @@ -22,6 +22,23 @@ # 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> @@ -57,30 +74,11 @@ /* 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 -/* 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 @@ -104,11 +102,6 @@ char *alloca (); /* 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. | |