Merge in changes for ConvexOS 11.0.

diff --git a/lib/regex.c b/lib/regex.c
index d0086ed1aad222ea0e9403c93d88895a3a077ec2..89a77f8d9c9069b9228100dd8848bf078d3dfab9 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -238,7 +238,11 @@ init_syntax_once ()
 #include <alloca.h>
 #else /* not __GNUC__ or HAVE_ALLOCA_H */
 #ifndef _AIX /* Already did AIX, up at the top.  */
+#if defined (__STDC__) && __STDC__
+void *alloca ();
+#else
 char *alloca ();
+#endif
 #endif /* not _AIX */
 #endif /* not HAVE_ALLOCA_H */ 
 #endif /* not __GNUC__ */