From 3653bb99971ea85c361a5d16f90a8b5a11fd60f9 Mon Sep 17 00:00:00 2001
From: Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
Date: Sat, 5 Jun 1999 11:41:22 +0200
Subject: [PATCH] * std/std_valarray.h: Don't #include unconditionally
 <alloca.h>

From-SVN: r27364
---
 libstdc++/ChangeLog          |  6 +++++-
 libstdc++/std/std_valarray.h | 26 +++++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index a5811cf0c6c..90723b9999d 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,4 +1,8 @@
-1999-06-06  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
+1999-06-05  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
+
+	* std/std_valarray.h: Don't #include unconditionally <alloca.h>
+
+1999-06-05  Gabriel Dos Reis  <dosreis@cmla.ens-cachan.fr>
 
 	* std/std_valarray.h: New file.
  	* std/slice.h: New file.
diff --git a/libstdc++/std/std_valarray.h b/libstdc++/std/std_valarray.h
index 2ac02371413..975d0a122ad 100644
--- a/libstdc++/std/std_valarray.h
+++ b/libstdc++/std/std_valarray.h
@@ -40,7 +40,31 @@
 #include <functional>
 #include <algorithm>
 
-#include <alloca.h>  // XXX non-standard.
+#ifndef alloca
+#ifdef __GNUC__
+#define alloca __builtin_alloca
+#else /* not GNU C.  */
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#include <alloca.h>
+#else /* not sparc */
+#if defined (MSDOS) && !defined (__TURBOC__)
+#include <malloc.h>
+#else /* not MSDOS, or __TURBOC__ */
+#if defined(_AIX)
+#include <malloc.h>
+ #pragma alloca
+#else /* not MSDOS, __TURBOC__, or _AIX */
+#ifdef __hpux
+#endif /* __hpux */
+#endif /* not _AIX */
+#endif /* not MSDOS, or __TURBOC__ */
+#endif /* not sparc.  */
+#endif /* not GNU C.  */
+#endif /* alloca not defined.  */
+
+extern "C" {
+   void* alloca(size_t);
+}
 
 extern "C++" {
 
-- 
2.30.2