summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-25 19:37:49 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-10-25 19:37:49 +0000
commit1139968b1d77131a280a5dbbc8891ebced136a74 (patch)
treeb2671269856807f8c6b756a98d6b6e5daacaa3f9
parentfc153153ce103bd5789b47024897320f4d23e3c6 (diff)
* eval.c, gc.c: use a common set of alloca() #ifdef's. This fixes
the build with Intel C Compiler for Linux. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c18
-rw-r--r--gc.c18
3 files changed, 25 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 5222b8dd08..8c8baa84eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 26 04:36:01 2002 Akinori MUSHA <knu@iDaemons.org>
+
+ * eval.c, gc.c: use a common set of alloca() #ifdef's. This fixes
+ the build with Intel C Compiler for Linux.
+
Tue Oct 22 18:15:49 2002 Guy Decoux <ts@moulon.inra.fr>
* eval.c (rb_eval): local_vars[-1] should protect body, not a
diff --git a/eval.c b/eval.c
index 02db227752..b09221617a 100644
--- a/eval.c
+++ b/eval.c
@@ -35,17 +35,19 @@
# endif
# endif /* atarist */
#else
-# if defined(HAVE_ALLOCA_H)
+# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-# elif !defined(alloca)
-char *alloca();
-# endif
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+# endif
+# endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
#endif /* __GNUC__ */
-#ifdef _AIX
-#pragma alloca
-#endif
-
#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
#define va_init_list(a,b) va_start(a,b)
diff --git a/gc.c b/gc.c
index 9801a19adb..3defaab7c7 100644
--- a/gc.c
+++ b/gc.c
@@ -36,17 +36,19 @@ void rb_io_fptr_finalize _((struct OpenFile*));
# endif
# endif /* atarist */
#else
-# if defined(HAVE_ALLOCA_H)
+# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-# elif !defined(alloca)
-void *alloca();
-# endif
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+# endif
+# endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
#endif /* __GNUC__ */
-#ifdef _AIX
-#pragma alloca
-#endif
-
static void run_final();
#ifndef GC_MALLOC_LIMIT