summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-07 03:43:42 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-07 03:43:42 +0000
commit390aa976987ea521522d86168d21b026aaac64dd (patch)
tree65963f9a87ff507ba517d9e39584e9c0fa0c8d95
parent244007bd9093a28bd0f9716d202811c6bb05443b (diff)
* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
warning. [ruby-dev:29191] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--dln.c4
-rw-r--r--eval.c4
-rw-r--r--gc.c4
-rw-r--r--regex.c19
-rw-r--r--ruby.h6
6 files changed, 21 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index ac466de15c..27f095e33f 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, regex.c, ruby.h: shut up AIX alloca
+ warning. [ruby-dev:29191]
+
Sun Aug 6 20:40:41 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 a54401a35a..b405da6bff 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 d1223f3130..afb528d59a 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 04f28e634a..e2516465a1 100644
--- a/gc.c
+++ b/gc.c
@@ -66,9 +66,7 @@ void 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/regex.c b/regex.c
index f2cd249060..ae0694b764 100644
--- a/regex.c
+++ b/regex.c
@@ -84,16 +84,19 @@ void rb_trap_exec _((void));
# endif
# endif /* atarist */
#else
-# if defined(HAVE_ALLOCA_H)
+# ifdef HAVE_ALLOCA_H
# include <alloca.h>
-# elif !defined(alloca)
-char *alloca();
-# endif
-#endif /* __GNUC__ */
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca /* predefined by HP cc +Olibcalls */
+void *alloca ();
+# endif
+# endif /* AIX */
+# endif /* HAVE_ALLOCA_H */
-#ifdef _AIX
-#pragma alloca
-#endif
+#endif /* __GNUC__ */
#ifdef HAVE_STRING_H
# include <string.h>
diff --git a/ruby.h b/ruby.h
index d8048f89cb..dcf7fbd822 100644
--- a/ruby.h
+++ b/ruby.h
@@ -65,10 +65,10 @@ extern "C" {
#if defined(HAVE_ALLOCA_H)
#include <alloca.h>
-#endif
-
-#ifdef _AIX
+#else
+# ifdef _AIX
#pragma alloca
+# endif
#endif
#if defined(__VMS)