aboutsummaryrefslogtreecommitdiffstats
path: root/include/memalloc.h
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2001-11-13 17:56:06 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:54 +0000
commitf73dda092b33638d2d5e9c35375f687a607b5403 (patch)
treef21584e70a444d6a1ecba0fb5e2cf79e8cce91db /include/memalloc.h
parent28ef6c316f1aff914bb95ac09787a3c83c1815fd (diff)
downloadandroid_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.gz
android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.tar.bz2
android_external_bash-f73dda092b33638d2d5e9c35375f687a607b5403.zip
Imported from ../bash-2.05a.tar.gz.
Diffstat (limited to 'include/memalloc.h')
-rw-r--r--include/memalloc.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/memalloc.h b/include/memalloc.h
index a1a2706..d3ed041 100644
--- a/include/memalloc.h
+++ b/include/memalloc.h
@@ -30,7 +30,7 @@
# define HAVE_ALLOCA
#endif
-#if defined (HAVE_ALLOCA_H) && !defined (HAVE_ALLOCA)
+#if defined (HAVE_ALLOCA_H) && !defined (HAVE_ALLOCA) && !defined (C_ALLOCA)
# define HAVE_ALLOCA
#endif /* HAVE_ALLOCA_H && !HAVE_ALLOCA */
@@ -49,7 +49,11 @@
extern void *alloca ();
# else
# if !defined (alloca)
+# if defined (__STDC__)
+extern void *alloca (size_t);
+# else
extern char *alloca ();
+# endif /* !__STDC__ */
# endif /* !alloca */
# endif /* !__hpux || !__STDC__ && !alloca */
# endif /* !HAVE_ALLOCA_H || C_ALLOCA */