diff options
| author | Jari Aalto <jari.aalto@cante.net> | 1996-12-23 17:02:34 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:49 +0000 |
| commit | ccc6cda312fea9f0468ee65b8f368e9653e1380b (patch) | |
| tree | b059878adcfd876c4acb8030deda1eeb918c7e75 /lib/posixheaders/memalloc.h | |
| parent | 726f63884db0132f01745f1fb4465e6621088ccf (diff) | |
| download | android_external_bash-ccc6cda312fea9f0468ee65b8f368e9653e1380b.tar.gz android_external_bash-ccc6cda312fea9f0468ee65b8f368e9653e1380b.tar.bz2 android_external_bash-ccc6cda312fea9f0468ee65b8f368e9653e1380b.zip | |
Imported from ../bash-2.0.tar.gz.
Diffstat (limited to 'lib/posixheaders/memalloc.h')
| -rw-r--r-- | lib/posixheaders/memalloc.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/posixheaders/memalloc.h b/lib/posixheaders/memalloc.h index 750d53d..ba210bb 100644 --- a/lib/posixheaders/memalloc.h +++ b/lib/posixheaders/memalloc.h @@ -19,8 +19,8 @@ with Bash; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if !defined (__MEMALLOC_H__) -# define __MEMALLOC_H__ +#if !defined (_MEMALLOC_H_) +# define _MEMALLOC_H_ #if defined (sparc) && defined (sun) && !defined (HAVE_ALLOCA_H) # define HAVE_ALLOCA_H @@ -34,8 +34,6 @@ # define HAVE_ALLOCA #endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */ -#if !defined (BUILDING_MAKEFILE) - #if defined (__GNUC__) # undef alloca # define alloca __builtin_alloca @@ -46,11 +44,15 @@ # else /* !IBMESA */ # include <alloca.h> # endif /* !IBMESA */ -# else +# else /* !HAVE_ALLOCA_H */ +# if defined (hpux_9) && defined (__STDC__) && !defined (alloca) +extern void *alloca (); +# else +# if !defined (alloca) extern char *alloca (); +# endif /* !alloca */ +# endif /* !hpux_9 || !__STDC__ && !alloca */ # endif /* !HAVE_ALLOCA_H */ #endif /* !__GNUC__ */ -#endif /* !BUILDING_MAKEFILE */ - -#endif /* __MEMALLOC_H__ */ +#endif /* _MEMALLOC_H_ */ |