ruby-dev

なかだです。

At Sat, 3 Feb 2001 19:36:53 +0900,
matz@zetabits.com (Yukihiro Matsumoto) wrote:
> そうですねえ。バックポートを作りましょうか。
> 代わりに作ってくれても構いませんけど。

  んじゃ。

	* configure.in (AC_C_INLINE): check inline attribute.

	* gc.c (is_pointer_to_heap): use inline rather than __inline__.

	* pack.c (hex2num): ditto.

	* ruby.h (rb_class_of, rb_type, rb_special_const_p): ditto.

	* util.c (rb_class_of, rb_type, rb_special_const_p): defined in
	  ruby.h.


Index: configure.in
===================================================================
RCS file: /cvs/ruby/src/ruby/configure.in,v
retrieving revision 1.68.2.2
diff -u -2 -p -r1.68.2.2 configure.in
--- configure.in	2001/01/31 14:27:36	1.68.2.2
+++ configure.in	2001/02/03 14:46:19
@@ -320,4 +320,5 @@ main()
 test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
 
+AC_C_INLINE
 AC_C_BIGENDIAN
 AC_C_CONST
Index: gc.c
===================================================================
RCS file: /cvs/ruby/src/ruby/gc.c,v
retrieving revision 1.48.2.7
diff -u -2 -p -r1.48.2.7 gc.c
--- gc.c	2001/02/02 11:39:51	1.48.2.7
+++ gc.c	2001/02/03 14:44:53
@@ -316,8 +316,5 @@ extern st_table *rb_class_tbl;
 VALUE *rb_gc_stack_start = 0;
 
-#if defined(__GNUC__) && __GNUC__ >= 2
-__inline__
-#endif
-static int
+static inline int
 is_pointer_to_heap(ptr)
     void *ptr;
Index: pack.c
===================================================================
RCS file: /cvs/ruby/src/ruby/pack.c,v
retrieving revision 1.17.2.1
diff -u -2 -p -r1.17.2.1 pack.c
--- pack.c	2001/01/09 07:29:03	1.17.2.1
+++ pack.c	2001/02/03 14:45:26
@@ -1027,9 +1027,5 @@ qpencode(str, from, len)
 }
 
-#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(RUBY_NO_INLINE)
-static __inline__ int
-#else
-static int
-#endif
+static inline int
 hex2num(c)
     char c;
Index: ruby.h
===================================================================
RCS file: /cvs/ruby/src/ruby/ruby.h,v
retrieving revision 1.29.2.1
diff -u -2 -p -r1.29.2.1 ruby.h
--- ruby.h	2001/02/02 11:39:51	1.29.2.1
+++ ruby.h	2001/02/03 14:41:11
@@ -543,10 +543,12 @@ 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
+#ifndef RUBY_NO_INLINE
+extern inline
+#endif
+VALUE
 rb_class_of(VALUE obj)
 {
@@ -560,5 +562,8 @@ rb_class_of(VALUE obj)
 }
 
-extern __inline__ int
+#ifndef RUBY_NO_INLINE
+extern inline
+#endif
+int
 rb_type(VALUE obj)
 {
@@ -572,5 +577,8 @@ rb_type(VALUE obj)
 }
 
-extern __inline__ int
+#ifndef RUBY_NO_INLINE
+extern inline
+#endif
+int
 rb_special_const_p(VALUE obj)
 {
@@ -578,10 +586,4 @@ rb_special_const_p(VALUE obj)
     return Qfalse;
 }
-
-#else
-VALUE rb_class_of _((VALUE));
-int rb_type _((VALUE));
-int rb_special_const_p _((VALUE));
-#endif
 
 #include "intern.h"
Index: util.c
===================================================================
RCS file: /cvs/ruby/src/ruby/util.c,v
retrieving revision 1.11
diff -u -2 -p -r1.11 util.c
--- util.c	2000/12/18 14:22:37	1.11
+++ util.c	2001/02/03 14:47:11
@@ -20,40 +20,4 @@
 #include "ruby.h"
 
-VALUE
-rb_class_of(obj)
-    VALUE obj;
-{
-    if (FIXNUM_P(obj)) return rb_cFixnum;
-    if (obj == Qnil) return rb_cNilClass;
-    if (obj == Qfalse) return rb_cFalseClass;
-    if (obj == Qtrue) return rb_cTrueClass;
-    if (SYMBOL_P(obj)) return rb_cSymbol;
-
-    return RBASIC(obj)->klass;
-}
-
-int
-rb_type(obj)
-    VALUE obj;
-{
-    if (FIXNUM_P(obj)) return T_FIXNUM;
-    if (obj == Qnil) return T_NIL;
-    if (obj == Qfalse) return T_FALSE;
-    if (obj == Qtrue) return T_TRUE;
-    if (obj == Qundef) return T_UNDEF;
-    if (SYMBOL_P(obj)) return T_SYMBOL;
-
-    return BUILTIN_TYPE(obj);
-}
-
-int
-rb_special_const_p(obj)
-    VALUE obj;
-{
-    if (SPECIAL_CONST_P(obj)) return Qtrue;
-
-    return Qfalse;
-}
-
 #include "util.h"
 #ifndef HAVE_STRING_H

Thread

Prev Next

In This Thread

Prev Next