kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c, gc.c: adopt a common set of alloca() #ifdef's. This

Browse source 
fixes the build with Intel C Compiler for Linux.

* eval.c (rb_f_require): declare old_func with a real type, not
  just type modifiers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2002-10-25 18:39:30 +00:00
parent 057f1f3020
commit 3da9449263
3 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sat Oct 26 03:28:43 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.
* eval.c (rb_f_require): declare old_func with a real type, not
just type modifiers.
Fri Oct 25 02:55:01 2002 Minero Aoki <aamine@loveruby.net> Fri Oct 25 02:55:01 2002 Minero Aoki <aamine@loveruby.net>
* string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL. * string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL.

18
eval.c
View file

@ -35,17 +35,19 @@
# endif # endif
# endif /* atarist */ # endif /* atarist */
#else #else
# if defined(HAVE_ALLOCA_H) # ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
# elif !defined(alloca) # else
char *alloca(); # ifdef _AIX
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
void *alloca ();
# endif # endif
# endif /* AIX */
# endif /* HAVE_ALLOCA_H */
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#ifdef _AIX
#pragma alloca
#endif
#ifdef HAVE_STDARG_PROTOTYPES #ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#define va_init_list(a,b) va_start(a,b) #define va_init_list(a,b) va_start(a,b)
@ -5601,7 +5603,7 @@ rb_f_require(obj, fname)
{ {
int volatile old_vmode = scope_vmode; int volatile old_vmode = scope_vmode;
NODE *const volatile old_node = ruby_current_node; NODE *const volatile old_node = ruby_current_node;
const volatile old_func = ruby_frame->last_func; const volatile ID old_func = ruby_frame->last_func;
ruby_current_node = 0; ruby_current_node = 0;
ruby_sourcefile = rb_source_filename(RSTRING(fname)->ptr); ruby_sourcefile = rb_source_filename(RSTRING(fname)->ptr);

18
gc.c
View file

@ -38,19 +38,25 @@ void rb_io_fptr_finalize _((struct OpenFile*));
#endif #endif
/* Make alloca work the best possible way. */ /* Make alloca work the best possible way. */
#ifndef __GNUC__ #ifdef __GNUC__
# if HAVE_ALLOCA_H # ifndef atarist
# ifndef alloca
# define alloca __builtin_alloca
# endif
# endif /* atarist */
#else
# ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
# else # else
# ifdef _AIX # ifdef _AIX
# pragma alloca #pragma alloca
# else # else
# ifndef alloca /* predefined by HP cc +Olibcalls */ # ifndef alloca /* predefined by HP cc +Olibcalls */
void *alloca (); void *alloca ();
# endif # endif
# endif # endif /* AIX */
# endif # endif /* HAVE_ALLOCA_H */
#endif #endif /* __GNUC__ */
#ifndef GC_MALLOC_LIMIT #ifndef GC_MALLOC_LIMIT
#if defined(MSDOS) || defined(__human68k__) #if defined(MSDOS) || defined(__human68k__)