diff options
| author | Jeff Law <law@gcc.gnu.org> | 1998-03-24 12:41:43 -0700 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-03-24 12:41:43 -0700 |
| commit | d275726b338f876c210555d7eadf8c3d81bae6a5 (patch) | |
| tree | 136f1d20658da254fd386793ce216800b7356521 /texinfo/info/tilde.c | |
| parent | f35e74f9a615e8b93da23af446667ee0bbfad0d0 (diff) | |
| download | gcc-d275726b338f876c210555d7eadf8c3d81bae6a5.zip gcc-d275726b338f876c210555d7eadf8c3d81bae6a5.tar.gz gcc-d275726b338f876c210555d7eadf8c3d81bae6a5.tar.bz2 | |
Merge in texinfo-3.12.
From-SVN: r18811
Diffstat (limited to 'texinfo/info/tilde.c')
| -rw-r--r-- | texinfo/info/tilde.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/texinfo/info/tilde.c b/texinfo/info/tilde.c index 46c3a5a..5013eae 100644 --- a/texinfo/info/tilde.c +++ b/texinfo/info/tilde.c @@ -1,10 +1,11 @@ /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo). - $Id: tilde.c,v 1.2 1998/03/24 18:06:55 law Exp $ + $Id: tilde.c,v 1.1.1.3 1998/03/24 18:20:19 law Exp $ This file is part of GNU Info, a program for reading online documentation stored in Info format. - Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc. + Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 98 + 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,22 +23,26 @@ Written by Brian Fox (bfox@ai.mit.edu). */ +/* Indent #pragma so that older Cpp's don't try to parse it. */ +#ifdef _AIX + #pragma alloca +#endif /* _AIX */ + /* Include config.h before doing alloca. */ #include "info.h" -#ifndef alloca -#if defined (__GNUC__) -# define alloca __builtin_alloca -#else /* !__GNUC__ */ -# if defined (_AIX) - #pragma alloca -# else /* !_AIX */ -# if defined (HAVE_ALLOCA_H) -# include <alloca.h> -# endif /* HAVE_ALLOCA_H */ -# endif /* !AIX */ -#endif /* !__GNUC__ */ -#endif /* ! defined alloca */ +#ifdef __GNUC__ +# undef alloca +# define alloca __builtin_alloca +#else +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifndef _AIX +char *alloca (); +# endif +# endif +#endif #if defined (TEST) || defined (STATIC_MALLOC) static void *xmalloc (), *xrealloc (); |