matz

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

1 files changed, 16 insertions, 12 deletions

diff --git a/ruby.h b/ruby.h
index ca97ee2c42..9784fc65d2 100644
--- a/ruby.h
+++ b/ruby.h
@@ -541,12 +541,15 @@ EXTERN VALUE rb_eNameError;
 EXTERN VALUE rb_eSyntaxError;
 EXTERN VALUE rb_eLoadError;
 
-#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(RUBY_NO_INLINE)
-extern __inline__ VALUE rb_class_of _((VALUE));
-extern __inline__ int rb_type _((VALUE));
-extern __inline__ int rb_special_const_p _((VALUE));
+extern INLINE VALUE rb_class_of _((VALUE));
+extern INLINE int rb_type _((VALUE));
+extern INLINE int rb_special_const_p _((VALUE));
 
-extern __inline__ VALUE
+#if defined(HAVE_INLINE) || defined(RUBY_NO_INLINE)
+#ifndef RUBY_NO_INLINE
+extern
+#endif
+INLINE VALUE
 rb_class_of(VALUE obj)
 {
     if (FIXNUM_P(obj)) return rb_cFixnum;
@@ -558,7 +561,10 @@ rb_class_of(VALUE obj)
     return RBASIC(obj)->klass;
 }
 
-extern __inline__ int
+#ifndef RUBY_NO_INLINE
+extern
+#endif
+INLINE int
 rb_type(VALUE obj)
 {
     if (FIXNUM_P(obj)) return T_FIXNUM;
@@ -570,17 +576,15 @@ rb_type(VALUE obj)
     return BUILTIN_TYPE(obj);
 }
 
-extern __inline__ int
+#ifndef RUBY_NO_INLINE
+extern
+#endif
+INLINE int
 rb_special_const_p(VALUE obj)
 {
     if (SPECIAL_CONST_P(obj)) return Qtrue;
     return Qfalse;
 }
-
-#else
-VALUE rb_class_of _((VALUE));
-int rb_type _((VALUE));
-int rb_special_const_p _((VALUE));
 #endif
 
 #include "intern.h"