[macruby-changes] [4399] MacRuby/trunk/include

[source_changes at macosforge.org]

Revision: 4399
          http://trac.macosforge.org/projects/ruby/changeset/4399
Author:   lsansonetti at apple.com
Date:     2010-08-02 18:09:29 -0700 (Mon, 02 Aug 2010)
Log Message:
-----------
move the HAVE_RUBY_XXX_H defines into ruby.h, export rb_reg_regcomp() in re.h

Modified Paths:
--------------
    MacRuby/trunk/include/ruby/defines.h
    MacRuby/trunk/include/ruby/re.h
    MacRuby/trunk/include/ruby.h

Modified: MacRuby/trunk/include/ruby/defines.h
===================================================================
--- MacRuby/trunk/include/ruby/defines.h	2010-08-03 00:18:10 UTC (rev 4398)
+++ MacRuby/trunk/include/ruby/defines.h	2010-08-03 01:09:29 UTC (rev 4399)
@@ -289,16 +289,6 @@
 
 #define WITH_OBJC 1 /* TODO: this should be set by configure */
 
-#ifndef HAVE_RUBY_VM_H
-// Some C extensions use that variable to determine if they build against 1.9.
-#define HAVE_RUBY_VM_H 
-#endif
-
-#ifndef HAVE_RUBY_ENCODING_H
-// Some C extensions use that variable to determine if they build against 1.9.
-#define HAVE_RUBY_ENCODING_H
-#endif
-
 #define force_inline __attribute__((always_inline))
 
 #if defined(__cplusplus)

Modified: MacRuby/trunk/include/ruby/re.h
===================================================================
--- MacRuby/trunk/include/ruby/re.h	2010-08-03 00:18:10 UTC (rev 4398)
+++ MacRuby/trunk/include/ruby/re.h	2010-08-03 01:09:29 UTC (rev 4399)
@@ -1 +1,14 @@
-// This file is there for backward compatibility with MRI.
+#ifndef RUBY_RE_H
+#define RUBY_RE_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+VALUE rb_reg_regcomp(VALUE);
+
+#if defined(__cplusplus)
+} // extern "C"
+#endif
+
+#endif // RUBY_RE_H

Modified: MacRuby/trunk/include/ruby.h
===================================================================
--- MacRuby/trunk/include/ruby.h	2010-08-03 00:18:10 UTC (rev 4398)
+++ MacRuby/trunk/include/ruby.h	2010-08-03 01:09:29 UTC (rev 4399)
@@ -12,10 +12,19 @@
 #ifndef RUBY_H
 #define RUBY_H 1
 
+#define HAVE_RUBY_DEFINES_H     1
+#define HAVE_RUBY_ENCODING_H    1
+#define HAVE_RUBY_INTERN_H      1
+#define HAVE_RUBY_IO_H          1
+#define HAVE_RUBY_MISSING_H     1
+#define HAVE_RUBY_RE_H          1
+#define HAVE_RUBY_RUBY_H        1
+#define HAVE_RUBY_ST_H          1
+#define HAVE_RUBY_UTIL_H        1
+#define HAVE_RUBY_VERSION_H     1
+#define HAVE_RUBY_VM_H          1
+
 #include <ruby/ruby.h>
-#if RUBY_VM
-#include <ruby/mvm.h>
-#endif
 
 extern void ruby_set_debug_option(const char *);
 #endif /* RUBY_H */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100802/e8442207/attachment.html>