diff options
author | Jari Aalto <jari.aalto@cante.net> | 1999-02-19 17:11:39 +0000 |
---|---|---|
committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:52 +0000 |
commit | b72432fdcc59300c6fe7c9d6c8a31ad3447933f5 (patch) | |
tree | b9899162338c2ff3fd83a8aef8831cb119e85cd7 /memalloc.h | |
parent | bc4cd23ce958feda898c618215f94d8a4e8f4ffa (diff) | |
download | android_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.tar.gz android_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.tar.bz2 android_external_bash-b72432fdcc59300c6fe7c9d6c8a31ad3447933f5.zip |
Imported from ../bash-2.03.tar.gz.
Diffstat (limited to 'memalloc.h')
-rw-r--r-- | memalloc.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -34,17 +34,17 @@ # define HAVE_ALLOCA #endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */ -#if defined (__GNUC__) +#if defined (__GNUC__) && !defined (C_ALLOCA) # undef alloca # define alloca __builtin_alloca -#else /* !__GNUC__ */ -# if defined (HAVE_ALLOCA_H) +#else /* !__GNUC__ || C_ALLOCA */ +# if defined (HAVE_ALLOCA_H) && !defined (C_ALLOCA) # if defined (IBMESA) # include <malloc.h> # else /* !IBMESA */ # include <alloca.h> # endif /* !IBMESA */ -# else /* !HAVE_ALLOCA_H */ +# else /* !HAVE_ALLOCA_H || C_ALLOCA */ # if defined (__hpux) && defined (__STDC__) && !defined (alloca) extern void *alloca (); # else @@ -52,7 +52,7 @@ extern void *alloca (); extern char *alloca (); # endif /* !alloca */ # endif /* !__hpux || !__STDC__ && !alloca */ -# endif /* !HAVE_ALLOCA_H */ -#endif /* !__GNUC__ */ +# endif /* !HAVE_ALLOCA_H || C_ALLOCA */ +#endif /* !__GNUC__ || C_ALLOCA */ #endif /* _MEMALLOC_H_ */ |