[macruby-changes] [4824] MacRuby/trunk/include/ruby

[source_changes at macosforge.org]

Revision: 4824
          http://trac.macosforge.org/projects/ruby/changeset/4824
Author:   lsansonetti at apple.com
Date:     2010-10-25 14:14:07 -0700 (Mon, 25 Oct 2010)
Log Message:
-----------
move the NATIVE macro from macruby.h to ruby.h since it's used there

Modified Paths:
--------------
    MacRuby/trunk/include/ruby/macruby.h
    MacRuby/trunk/include/ruby/ruby.h

Modified: MacRuby/trunk/include/ruby/macruby.h
===================================================================
--- MacRuby/trunk/include/ruby/macruby.h	2010-10-25 21:13:37 UTC (rev 4823)
+++ MacRuby/trunk/include/ruby/macruby.h	2010-10-25 21:14:07 UTC (rev 4824)
@@ -18,9 +18,6 @@
 #include <assert.h>
 #include <CoreFoundation/CoreFoundation.h>
 
-bool rb_obj_is_native(VALUE obj);
-#define NATIVE(obj) (rb_obj_is_native((VALUE)obj))
-
 void rb_include_module2(VALUE klass, VALUE orig_klass, VALUE module, bool check,
 	bool add_methods);
 

Modified: MacRuby/trunk/include/ruby/ruby.h
===================================================================
--- MacRuby/trunk/include/ruby/ruby.h	2010-10-25 21:13:37 UTC (rev 4823)
+++ MacRuby/trunk/include/ruby/ruby.h	2010-10-25 21:14:07 UTC (rev 4824)
@@ -691,6 +691,9 @@
 
 #define SPECIAL_CONST_P(x) (IMMEDIATE_P(x) || !RTEST(x))
 
+int rb_obj_is_native(VALUE obj);
+#define NATIVE(obj) (rb_obj_is_native((VALUE)obj))
+
 #define FL_ABLE(x) (!SPECIAL_CONST_P(x) && !NATIVE(x) && BUILTIN_TYPE(x) != T_NODE)
 #define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
 #define FL_ANY(x,f) FL_TEST(x,f)
@@ -1027,7 +1030,6 @@
     return rb_objc_type(obj);
 }
 
-// static inline bool
 static inline int
 rb_special_const_p(VALUE obj)
 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101025/83e0e64a/attachment-0001.html>