summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dln.c4
-rw-r--r--eval.c4
-rw-r--r--gc.c4
-rw-r--r--ruby.h6
5 files changed, 10 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 29a284a37..2b813f399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 7 12:05:28 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * dln.c, eval.c, gc.c, ruby.h: shut up AIX alloca warning.
+ [ruby-dev:29191]
+
Sun Aug 6 20:34:24 2006 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
diff --git a/dln.c b/dln.c
index 55e500240..49a950119 100644
--- a/dln.c
+++ b/dln.c
@@ -27,10 +27,6 @@
char *dln_argv0;
#endif
-#ifdef _AIX
-#pragma alloca
-#endif
-
#if defined(HAVE_ALLOCA_H)
#include <alloca.h>
#endif
diff --git a/eval.c b/eval.c
index 385684813..48ecb28a9 100644
--- a/eval.c
+++ b/eval.c
@@ -53,9 +53,7 @@
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else
-# ifdef _AIX
- #pragma alloca
-# else
+# ifndef _AIX
# ifndef alloca /* predefined by HP cc +Olibcalls */
void *alloca ();
# endif
diff --git a/gc.c b/gc.c
index 9569aec05..ea1bdf0ec 100644
--- a/gc.c
+++ b/gc.c
@@ -51,9 +51,7 @@ int rb_io_fptr_finalize(struct OpenFile*);
# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else
-# ifdef _AIX
- #pragma alloca
-# else
+# ifndef _AIX
# ifndef alloca /* predefined by HP cc +Olibcalls */
void *alloca ();
# endif
diff --git a/ruby.h b/ruby.h
index 800cbd854..48de854e7 100644
--- a/ruby.h
+++ b/ruby.h
@@ -79,10 +79,10 @@ extern "C" {
#if defined(HAVE_ALLOCA_H)
#include <alloca.h>
-#endif
-
-#ifdef _AIX
+#else
+# ifdef _AIX
#pragma alloca
+# endif
#endif
#if defined(__VMS)