* ruby.h: better inline function support.

* configure.in (NO_C_INLINE): check if inline is available for the
  C compiler.

* marshal.c (r_object): len calculation patch was wrong for
  machines SIZEOF_BDIGITS == SIZEOF_SHORT.

* gc.c: alloca prototype reorganized for C_ALLOCA machine.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 15 deletions

diff --git a/ruby.h b/ruby.h
index 0e9352c7e5..48e2258588 100644
--- a/ruby.h
+++ b/ruby.h
@@ -546,11 +546,10 @@ extern inline VALUE rb_class_of _((VALUE));
 extern inline int rb_type _((VALUE));
 extern inline int rb_special_const_p _((VALUE));
 
-#ifndef RUBY_NO_INLINE
-extern inline
-#endif
-VALUE
-rb_class_of(VALUE obj)
+#if !defined(NO_C_INLINE) || defined(INLINE_DEFINE)
+extern inline VALUE
+rb_class_of(obj)
+    VALUE obj;
 {
     if (FIXNUM_P(obj)) return rb_cFixnum;
     if (obj == Qnil) return rb_cNilClass;
@@ -561,11 +560,9 @@ rb_class_of(VALUE obj)
     return RBASIC(obj)->klass;
 }
 
-#ifndef RUBY_NO_INLINE
-extern inline
-#endif
-int
-rb_type(VALUE obj)
+extern inline int
+rb_type(obj)
+    VALUE obj;
 {
     if (FIXNUM_P(obj)) return T_FIXNUM;
     if (obj == Qnil) return T_NIL;
@@ -576,15 +573,14 @@ rb_type(VALUE obj)
     return BUILTIN_TYPE(obj);
 }
 
-#ifndef RUBY_NO_INLINE
-extern inline
-#endif
-int
-rb_special_const_p(VALUE obj)
+extern inline int
+rb_special_const_p(obj)
+    VALUE obj;
 {
     if (SPECIAL_CONST_P(obj)) return Qtrue;
     return Qfalse;
 }
+#endif
 
 #include "intern.h"