diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dln.c | 4 | ||||
-rw-r--r-- | eval.c | 4 | ||||
-rw-r--r-- | gc.c | 4 | ||||
-rw-r--r-- | regex.c | 19 | ||||
-rw-r--r-- | ruby.h | 6 |
6 files changed, 21 insertions, 21 deletions
@@ -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. @@ -27,10 +27,6 @@ char *dln_argv0; #endif -#ifdef _AIX -#pragma alloca -#endif - #if defined(HAVE_ALLOCA_H) #include <alloca.h> #endif @@ -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 @@ -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 @@ -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> @@ -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) |