[macruby-changes] [5137] MacRuby/trunk

source_changes at macosforge.org source_changes at macosforge.org
Fri Jan 7 19:18:15 PST 2011 

Revision: 5137
          http://trac.macosforge.org/projects/ruby/changeset/5137
Author:   lsansonetti at apple.com
Date:     2011-01-07 19:18:10 -0800 (Fri, 07 Jan 2011)
Log Message:
-----------
include/ruby/macruby.h -> macruby_internal.h

Modified Paths:
--------------
    MacRuby/trunk/MacRuby.m
    MacRuby/trunk/NSArray.m
    MacRuby/trunk/NSDictionary.m
    MacRuby/trunk/NSString.m
    MacRuby/trunk/array.c
    MacRuby/trunk/bignum.c
    MacRuby/trunk/bridgesupport.cpp
    MacRuby/trunk/class.c
    MacRuby/trunk/compar.c
    MacRuby/trunk/compiler.cpp
    MacRuby/trunk/complex.c
    MacRuby/trunk/cont.c
    MacRuby/trunk/debugger.cpp
    MacRuby/trunk/dir.c
    MacRuby/trunk/dispatcher.cpp
    MacRuby/trunk/dln.c
    MacRuby/trunk/encoding.c
    MacRuby/trunk/enum.c
    MacRuby/trunk/enumerator.c
    MacRuby/trunk/env.c
    MacRuby/trunk/error.c
    MacRuby/trunk/eval.c
    MacRuby/trunk/ext/bigdecimal/bigdecimal.c
    MacRuby/trunk/ext/bigdecimal/extconf.rb
    MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c
    MacRuby/trunk/ext/digest/bubblebabble/extconf.rb
    MacRuby/trunk/ext/digest/digest.h
    MacRuby/trunk/ext/digest/extconf.rb
    MacRuby/trunk/ext/digest/md5/extconf.rb
    MacRuby/trunk/ext/digest/rmd160/extconf.rb
    MacRuby/trunk/ext/digest/sha1/extconf.rb
    MacRuby/trunk/ext/digest/sha2/extconf.rb
    MacRuby/trunk/ext/etc/etc.c
    MacRuby/trunk/ext/etc/extconf.rb
    MacRuby/trunk/ext/iconv/iconv.c
    MacRuby/trunk/ext/json/rubyext.c
    MacRuby/trunk/ext/libyaml/rubyext.c
    MacRuby/trunk/ext/nkf/extconf.rb
    MacRuby/trunk/ext/nkf/nkf.c
    MacRuby/trunk/ext/openssl/ossl.h
    MacRuby/trunk/ext/readline/extconf.rb
    MacRuby/trunk/ext/readline/readline.c
    MacRuby/trunk/ext/socket/extconf.rb
    MacRuby/trunk/ext/socket/socket.c
    MacRuby/trunk/ext/zlib/zlib.c
    MacRuby/trunk/file.c
    MacRuby/trunk/gc.c
    MacRuby/trunk/gcd.c
    MacRuby/trunk/hash.c
    MacRuby/trunk/id.c
    MacRuby/trunk/inits.c
    MacRuby/trunk/interpreter.cpp
    MacRuby/trunk/io.c
    MacRuby/trunk/kernel.c
    MacRuby/trunk/load.c
    MacRuby/trunk/main.cpp
    MacRuby/trunk/marshal.c
    MacRuby/trunk/math.c
    MacRuby/trunk/numeric.c
    MacRuby/trunk/objc.m
    MacRuby/trunk/object.c
    MacRuby/trunk/pack.c
    MacRuby/trunk/parse.y
    MacRuby/trunk/prec.c
    MacRuby/trunk/proc.c
    MacRuby/trunk/process.c
    MacRuby/trunk/rakelib/builder/builder.rb
    MacRuby/trunk/random.c
    MacRuby/trunk/range.c
    MacRuby/trunk/rational.c
    MacRuby/trunk/re.c
    MacRuby/trunk/ruby.c
    MacRuby/trunk/sandbox.c
    MacRuby/trunk/signal.c
    MacRuby/trunk/sprintf.c
    MacRuby/trunk/st.c
    MacRuby/trunk/string.c
    MacRuby/trunk/struct.c
    MacRuby/trunk/symbol.c
    MacRuby/trunk/thread.c
    MacRuby/trunk/time.c
    MacRuby/trunk/transcode.c
    MacRuby/trunk/ucnv.c
    MacRuby/trunk/util.c
    MacRuby/trunk/variable.c
    MacRuby/trunk/version.c
    MacRuby/trunk/vm.cpp
    MacRuby/trunk/vm_eval.c

Added Paths:
-----------
    MacRuby/trunk/macruby_internal.h

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

Modified: MacRuby/trunk/MacRuby.m
===================================================================
--- MacRuby/trunk/MacRuby.m	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/MacRuby.m	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/objc.h"
 #include "vm.h"

Modified: MacRuby/trunk/NSArray.m
===================================================================
--- MacRuby/trunk/NSArray.m	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/NSArray.m	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "objc.h"
 #include "vm.h"

Modified: MacRuby/trunk/NSDictionary.m
===================================================================
--- MacRuby/trunk/NSDictionary.m	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/NSDictionary.m	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "objc.h"
 #include "vm.h"

Modified: MacRuby/trunk/NSString.m
===================================================================
--- MacRuby/trunk/NSString.m	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/NSString.m	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "objc.h"
 #include "vm.h"

Modified: MacRuby/trunk/array.c
===================================================================
--- MacRuby/trunk/array.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/array.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
 #include "id.h"

Modified: MacRuby/trunk/bignum.c
===================================================================
--- MacRuby/trunk/bignum.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/bignum.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 #include "objc.h"
 #include "encoding.h"

Modified: MacRuby/trunk/bridgesupport.cpp
===================================================================
--- MacRuby/trunk/bridgesupport.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/bridgesupport.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -24,7 +24,7 @@
 using namespace llvm;
 #endif
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "compiler.h"

Modified: MacRuby/trunk/class.c
===================================================================
--- MacRuby/trunk/class.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/class.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/signal.h"
 #include "ruby/node.h"
 #include "ruby/st.h"

Modified: MacRuby/trunk/compar.c
===================================================================
--- MacRuby/trunk/compar.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/compar.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 

Modified: MacRuby/trunk/compiler.cpp
===================================================================
--- MacRuby/trunk/compiler.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/compiler.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -18,7 +18,7 @@
 #include <llvm/Transforms/Utils/Cloning.h>
 
 #include "llvm.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "ruby/node.h"
 #include "id.h"

Modified: MacRuby/trunk/complex.c
===================================================================
--- MacRuby/trunk/complex.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/complex.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -5,7 +5,7 @@
   which is written in ruby.
 */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include <math.h>
 #include "ruby/node.h"
 #include "vm.h"

Modified: MacRuby/trunk/cont.c
===================================================================
--- MacRuby/trunk/cont.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/cont.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 enum context_type {
     CONTINUATION_CONTEXT = 0,

Modified: MacRuby/trunk/debugger.cpp
===================================================================
--- MacRuby/trunk/debugger.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/debugger.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -24,7 +24,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "compiler.h"

Modified: MacRuby/trunk/dir.c
===================================================================
--- MacRuby/trunk/dir.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/dir.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/util.h"
 #include "vm.h"

Modified: MacRuby/trunk/dispatcher.cpp
===================================================================
--- MacRuby/trunk/dispatcher.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/dispatcher.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  */
 
 #include "llvm.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "id.h"
 #include "vm.h"

Modified: MacRuby/trunk/dln.c
===================================================================
--- MacRuby/trunk/dln.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/dln.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "dln.h"

Modified: MacRuby/trunk/encoding.c
===================================================================
--- MacRuby/trunk/encoding.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/encoding.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 #include <string.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 #include "symbol.h"

Modified: MacRuby/trunk/enum.c
===================================================================
--- MacRuby/trunk/enum.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/enum.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/util.h"
 #include "vm.h"

Modified: MacRuby/trunk/enumerator.c
===================================================================
--- MacRuby/trunk/enumerator.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/enumerator.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -12,7 +12,7 @@
 
 ************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "id.h"
 
 /*

Modified: MacRuby/trunk/env.c
===================================================================
--- MacRuby/trunk/env.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/env.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "ruby/node.h"

Modified: MacRuby/trunk/error.c
===================================================================
--- MacRuby/trunk/error.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/error.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/st.h"
 #include "ruby/node.h"
 #include "vm.h"

Modified: MacRuby/trunk/eval.c
===================================================================
--- MacRuby/trunk/eval.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/eval.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "dtrace.h"

Modified: MacRuby/trunk/ext/bigdecimal/bigdecimal.c
===================================================================
--- MacRuby/trunk/ext/bigdecimal/bigdecimal.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/bigdecimal/bigdecimal.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -15,7 +15,7 @@
 
 /* #define BIGDECIMAL_DEBUG 1 */
 #include "bigdecimal.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 #include <ctype.h>
 #include <stdio.h>

Modified: MacRuby/trunk/ext/bigdecimal/extconf.rb
===================================================================
--- MacRuby/trunk/ext/bigdecimal/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/bigdecimal/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$INCFLAGS << ' -I../..'
+
 have_func("labs", "stdlib.h")
 have_func("llabs", "stdlib.h")
 

Modified: MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c
===================================================================
--- MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/bubblebabble/bubblebabble.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 ************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "digest.h"
 
 static ID id_digest;

Modified: MacRuby/trunk/ext/digest/bubblebabble/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/bubblebabble/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/bubblebabble/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,6 +1,6 @@
 require 'mkmf'
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$INCFLAGS << " -I$(srcdir)/.. -I../../.."
 
 create_makefile('digest/bubblebabble')

Modified: MacRuby/trunk/ext/digest/digest.h
===================================================================
--- MacRuby/trunk/ext/digest/digest.h	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/digest.h	2011-01-08 03:18:10 UTC (rev 5137)
@@ -13,7 +13,7 @@
 
 ************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 #define RUBY_DIGEST_API_VERSION	2
 

Modified: MacRuby/trunk/ext/digest/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -3,4 +3,6 @@
 
 require "mkmf"
 
+$INCFLAGS << ' -I../..'
+
 create_makefile("digest")

Modified: MacRuby/trunk/ext/digest/md5/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/md5/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/md5/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$INCFLAGS << " -I$(srcdir)/.. -I../../.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 

Modified: MacRuby/trunk/ext/digest/rmd160/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/rmd160/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/rmd160/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$INCFLAGS << " -I$(srcdir)/.. -I../../.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 

Modified: MacRuby/trunk/ext/digest/sha1/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/sha1/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/sha1/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$INCFLAGS << " -I$(srcdir)/.. -I../../.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 

Modified: MacRuby/trunk/ext/digest/sha2/extconf.rb
===================================================================
--- MacRuby/trunk/ext/digest/sha2/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/digest/sha2/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -4,7 +4,7 @@
 require "mkmf"
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$INCFLAGS << " -I$(srcdir)/.. -I../../.."
 
 $objs = [
   "sha2.#{$OBJEXT}",

Modified: MacRuby/trunk/ext/etc/etc.c
===================================================================
--- MacRuby/trunk/ext/etc/etc.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/etc/etc.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
 
 ************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H

Modified: MacRuby/trunk/ext/etc/extconf.rb
===================================================================
--- MacRuby/trunk/ext/etc/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/etc/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$INCFLAGS << ' -I../..'
+
 have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
 a = have_func("getlogin")
 b = have_func("getpwent")

Modified: MacRuby/trunk/ext/iconv/iconv.c
===================================================================
--- MacRuby/trunk/ext/iconv/iconv.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/iconv/iconv.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -13,7 +13,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "encoding.h"

Modified: MacRuby/trunk/ext/json/rubyext.c
===================================================================
--- MacRuby/trunk/ext/json/rubyext.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/json/rubyext.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
  *
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/intern.h"
 #include "ruby/node.h"
 #include "ruby/io.h"

Modified: MacRuby/trunk/ext/libyaml/rubyext.c
===================================================================
--- MacRuby/trunk/ext/libyaml/rubyext.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/libyaml/rubyext.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -6,7 +6,7 @@
  * Copyright (C) 2009-2010, Apple Inc. All rights reserved.
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/intern.h"
 #include "ruby/node.h"
 #include "ruby/io.h"

Modified: MacRuby/trunk/ext/nkf/extconf.rb
===================================================================
--- MacRuby/trunk/ext/nkf/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/nkf/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,2 +1,5 @@
 require 'mkmf'
+
+$INCFLAGS << ' -I../..'
+
 create_makefile('nkf')

Modified: MacRuby/trunk/ext/nkf/nkf.c
===================================================================
--- MacRuby/trunk/ext/nkf/nkf.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/nkf/nkf.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -10,7 +10,7 @@
 #define RUBY_NKF_REVISION "$Revision: 16493 $"
 #define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 
 /* Replace nkf's getchar/putchar for variable modification */

Modified: MacRuby/trunk/ext/openssl/ossl.h
===================================================================
--- MacRuby/trunk/ext/openssl/ossl.h	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/openssl/ossl.h	2011-01-08 03:18:10 UTC (rev 5137)
@@ -28,7 +28,7 @@
 #if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
 #  undef RFILE
 #endif
-#include <ruby/macruby.h>
+#include <macruby_internal.h>
 #include <ruby/io.h>
 
 /*

Modified: MacRuby/trunk/ext/readline/extconf.rb
===================================================================
--- MacRuby/trunk/ext/readline/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/readline/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,5 +1,7 @@
 require "mkmf"
 
+$INCFLAGS << ' -I../..'
+
 $readline_headers = ["stdio.h"]
 
 def have_readline_header(header)

Modified: MacRuby/trunk/ext/readline/readline.c
===================================================================
--- MacRuby/trunk/ext/readline/readline.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/readline/readline.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -33,7 +33,7 @@
 #include <editline/readline.h>
 #endif
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/io.h"
 
 #ifdef HAVE_UNISTD_H

Modified: MacRuby/trunk/ext/socket/extconf.rb
===================================================================
--- MacRuby/trunk/ext/socket/extconf.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/socket/extconf.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,5 +1,7 @@
 require 'mkmf'
 
+$INCFLAGS << ' -I../..'
+
 case RUBY_PLATFORM
 when /(ms|bcc)win32|mingw/
   test_func = "WSACleanup"

Modified: MacRuby/trunk/ext/socket/socket.c
===================================================================
--- MacRuby/trunk/ext/socket/socket.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/socket/socket.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 ************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/io.h"
 #include "ruby/signal.h"
 #include "ruby/util.h"

Modified: MacRuby/trunk/ext/zlib/zlib.c
===================================================================
--- MacRuby/trunk/ext/zlib/zlib.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ext/zlib/zlib.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  * Copyright (C) UENO Katsuhiro 2000-2003
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/intern.h"
 #include "ruby/node.h"
 #include "ruby/io.h"

Modified: MacRuby/trunk/file.c
===================================================================
--- MacRuby/trunk/file.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/file.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/io.h"
 #include "ruby/signal.h"
 #include "ruby/util.h"

Modified: MacRuby/trunk/gc.c
===================================================================
--- MacRuby/trunk/gc.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/gc.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -17,7 +17,7 @@
 # include "auto_zone_1060.h"
 #endif
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/signal.h"
 #include "ruby/st.h"
 #include "ruby/node.h"

Modified: MacRuby/trunk/gcd.c
===================================================================
--- MacRuby/trunk/gcd.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/gcd.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #define GCD_BLOCKS_COPY_DVARS 1
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "gcd.h"
 #include <unistd.h>
 #include "ruby/intern.h"

Modified: MacRuby/trunk/hash.c
===================================================================
--- MacRuby/trunk/hash.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/hash.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "ruby/signal.h"

Modified: MacRuby/trunk/id.c
===================================================================
--- MacRuby/trunk/id.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/id.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 

Deleted: MacRuby/trunk/include/ruby/macruby.h
===================================================================
--- MacRuby/trunk/include/ruby/macruby.h	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/include/ruby/macruby.h	2011-01-08 03:18:10 UTC (rev 5137)
@@ -1,143 +0,0 @@
-/*
- * This file is covered by the Ruby license. See COPYING for more details.
- *
- * Copyright (C) 2007-2010, Apple Inc. All rights reserved 
- */
-
-#ifndef RUBY_MACRUBY_H
-#define RUBY_MACRUBY_H 1
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#include "ruby.h"
-
-#include <objc/objc.h>
-#include <objc/runtime.h>
-#include <objc/message.h>
-#include <objc/objc-auto.h>
-#include <assert.h>
-#include <CoreFoundation/CoreFoundation.h>
-
-void rb_include_module2(VALUE klass, VALUE orig_klass, VALUE module, bool check,
-	bool add_methods);
-
-VALUE rb_objc_block_call(VALUE obj, SEL sel, int argc,
-	VALUE *argv, VALUE (*bl_proc) (ANYARGS), VALUE data2);
-
-#if !defined(__AUTO_ZONE__)
-boolean_t auto_zone_set_write_barrier(void *zone, const void *dest, const void *new_value);
-void auto_zone_add_root(void *zone, void *address_of_root_ptr, void *value);
-void auto_zone_retain(void *zone, void *ptr);
-unsigned int auto_zone_release(void *zone, void *ptr);
-extern void *__auto_zone;
-#else
-extern auto_zone_t *__auto_zone;
-#endif
-
-#define GC_WB_0(dst, newval, check) \
-    do { \
-	void *nv = (void *)newval; \
-	if (!SPECIAL_CONST_P(nv)) { \
-	    if (!auto_zone_set_write_barrier(__auto_zone, \
-			(const void *)dst, (const void *)nv)) { \
-		if (check) { \
-		    rb_bug("destination %p isn't in the auto zone", dst); \
-		} \
-	    } \
-	} \
-	*(void **)dst = nv; \
-    } \
-    while (0)
-
-#define GC_WB(dst, newval) GC_WB_0(dst, newval, true)
-
-static inline void *
-rb_objc_retain(void *addr)
-{
-    if (addr != NULL && !SPECIAL_CONST_P(addr)) {
-        auto_zone_retain(__auto_zone, addr);
-    }
-    return addr;
-}
-#define GC_RETAIN(obj) (rb_objc_retain((void *)obj))
-
-static inline void *
-rb_objc_release(void *addr)
-{
-    if (addr != NULL && !SPECIAL_CONST_P(addr)) {
-        auto_zone_release(__auto_zone, addr);
-    }
-    return addr;
-}
-#define GC_RELEASE(obj) (rb_objc_release((void *)obj))
-
-// MacRubyIntern.h
-
-/* enumerator.c */
-VALUE rb_enumeratorize(VALUE, SEL, int, VALUE *);
-#define RETURN_ENUMERATOR(obj, argc, argv) \
-    do {	\
-	if (!rb_block_given_p()) { \
-	    return rb_enumeratorize((VALUE)obj, sel, argc, argv); \
-	} \
-    } while (0)
-VALUE rb_f_notimplement(VALUE rcv, SEL sel);
-VALUE rb_method_call(VALUE, SEL, int, VALUE*);
-VALUE rb_file_directory_p(VALUE,SEL,VALUE);
-VALUE rb_obj_id(VALUE obj, SEL sel);
-
-void rb_objc_gc_register_thread(void);
-void rb_objc_gc_unregister_thread(void);
-void rb_objc_set_associative_ref(void *, void *, void *);
-void *rb_objc_get_associative_ref(void *, void *);
-
-VALUE rb_io_gets(VALUE, SEL);
-VALUE rb_io_getbyte(VALUE, SEL);
-VALUE rb_io_ungetc(VALUE, SEL, VALUE);
-VALUE rb_io_flush(VALUE, SEL);
-VALUE rb_io_eof(VALUE, SEL);
-VALUE rb_io_binmode(VALUE, SEL);
-VALUE rb_io_addstr(VALUE, SEL, VALUE);
-VALUE rb_io_printf(VALUE, SEL, int, VALUE *);
-VALUE rb_io_print(VALUE, SEL, int, VALUE *);
-
-VALUE rb_objc_num_coerce_bin(VALUE x, VALUE Y, SEL sel);
-VALUE rb_objc_num_coerce_cmp(VALUE, VALUE, SEL sel);
-VALUE rb_objc_num_coerce_relop(VALUE, VALUE, SEL sel);
-
-VALUE rb_f_kill(VALUE, SEL, int, VALUE*);
-VALUE rb_struct_initialize(VALUE, SEL, VALUE);
-VALUE rb_class_real(VALUE, bool hide_builtin_foundation_classes);
-void rb_range_extract(VALUE range, VALUE *begp, VALUE *endp, bool *exclude);
-VALUE rb_cvar_get2(VALUE klass, ID id, bool check);
-
-VALUE rb_require_framework(VALUE, SEL, int, VALUE *);
-
-RUBY_EXTERN VALUE rb_cNSObject;
-RUBY_EXTERN VALUE rb_cRubyObject;
-RUBY_EXTERN VALUE rb_cNSString;
-RUBY_EXTERN VALUE rb_cNSMutableString;
-RUBY_EXTERN VALUE rb_cRubyString;
-RUBY_EXTERN VALUE rb_cNSArray;
-RUBY_EXTERN VALUE rb_cNSMutableArray;
-RUBY_EXTERN VALUE rb_cRubyArray;
-RUBY_EXTERN VALUE rb_cNSHash;
-RUBY_EXTERN VALUE rb_cNSMutableHash;
-RUBY_EXTERN VALUE rb_cRubyHash;
-RUBY_EXTERN VALUE rb_cNSNumber;
-RUBY_EXTERN VALUE rb_cNSDate;
-RUBY_EXTERN VALUE rb_cBoxed;
-RUBY_EXTERN VALUE rb_cPointer;
-RUBY_EXTERN VALUE rb_cTopLevel;
-
-long rb_objc_flag_get_mask(const void *);
-void rb_objc_flag_set(const void *, int, bool);
-bool rb_objc_flag_check(const void *, int);
-
-#if defined(__cplusplus)
-}  // extern "C" {
-#endif
-
-#endif /* RUBY_MACRUBY_H */

Modified: MacRuby/trunk/inits.c
===================================================================
--- MacRuby/trunk/inits.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/inits.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 void Init_Array(void);
 void Init_Bignum(void);

Modified: MacRuby/trunk/interpreter.cpp
===================================================================
--- MacRuby/trunk/interpreter.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/interpreter.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 #if !defined(MACRUBY_STATIC)
 
 #include "llvm.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "interpreter.h"
 #include "vm.h"

Modified: MacRuby/trunk/io.c
===================================================================
--- MacRuby/trunk/io.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/io.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/io.h"
 #include "ruby/util.h"
 #include "ruby/node.h"

Modified: MacRuby/trunk/kernel.c
===================================================================
--- MacRuby/trunk/kernel.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/kernel.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
  * Copyright (C) 2010, Apple Inc. All rights reserved.
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "compiler.h"

Modified: MacRuby/trunk/load.c
===================================================================
--- MacRuby/trunk/load.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/load.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  */
 
 #include <sys/stat.h>
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "dln.h"

Copied: MacRuby/trunk/macruby_internal.h (from rev 5134, MacRuby/trunk/include/ruby/macruby.h)
===================================================================
--- MacRuby/trunk/macruby_internal.h	                        (rev 0)
+++ MacRuby/trunk/macruby_internal.h	2011-01-08 03:18:10 UTC (rev 5137)
@@ -0,0 +1,143 @@
+/*
+ * This file is covered by the Ruby license. See COPYING for more details.
+ *
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved 
+ */
+
+#ifndef __MACRUBY_INTERNAL_H
+#define __MACRUBY_INTERNAL_H 1
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+#include "ruby.h"
+
+#include <objc/objc.h>
+#include <objc/runtime.h>
+#include <objc/message.h>
+#include <objc/objc-auto.h>
+#include <assert.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+void rb_include_module2(VALUE klass, VALUE orig_klass, VALUE module, bool check,
+	bool add_methods);
+
+VALUE rb_objc_block_call(VALUE obj, SEL sel, int argc,
+	VALUE *argv, VALUE (*bl_proc) (ANYARGS), VALUE data2);
+
+#if !defined(__AUTO_ZONE__)
+boolean_t auto_zone_set_write_barrier(void *zone, const void *dest, const void *new_value);
+void auto_zone_add_root(void *zone, void *address_of_root_ptr, void *value);
+void auto_zone_retain(void *zone, void *ptr);
+unsigned int auto_zone_release(void *zone, void *ptr);
+extern void *__auto_zone;
+#else
+extern auto_zone_t *__auto_zone;
+#endif
+
+#define GC_WB_0(dst, newval, check) \
+    do { \
+	void *nv = (void *)newval; \
+	if (!SPECIAL_CONST_P(nv)) { \
+	    if (!auto_zone_set_write_barrier(__auto_zone, \
+			(const void *)dst, (const void *)nv)) { \
+		if (check) { \
+		    rb_bug("destination %p isn't in the auto zone", dst); \
+		} \
+	    } \
+	} \
+	*(void **)dst = nv; \
+    } \
+    while (0)
+
+#define GC_WB(dst, newval) GC_WB_0(dst, newval, true)
+
+static inline void *
+rb_objc_retain(void *addr)
+{
+    if (addr != NULL && !SPECIAL_CONST_P(addr)) {
+        auto_zone_retain(__auto_zone, addr);
+    }
+    return addr;
+}
+#define GC_RETAIN(obj) (rb_objc_retain((void *)obj))
+
+static inline void *
+rb_objc_release(void *addr)
+{
+    if (addr != NULL && !SPECIAL_CONST_P(addr)) {
+        auto_zone_release(__auto_zone, addr);
+    }
+    return addr;
+}
+#define GC_RELEASE(obj) (rb_objc_release((void *)obj))
+
+// MacRubyIntern.h
+
+/* enumerator.c */
+VALUE rb_enumeratorize(VALUE, SEL, int, VALUE *);
+#define RETURN_ENUMERATOR(obj, argc, argv) \
+    do {	\
+	if (!rb_block_given_p()) { \
+	    return rb_enumeratorize((VALUE)obj, sel, argc, argv); \
+	} \
+    } while (0)
+VALUE rb_f_notimplement(VALUE rcv, SEL sel);
+VALUE rb_method_call(VALUE, SEL, int, VALUE*);
+VALUE rb_file_directory_p(VALUE,SEL,VALUE);
+VALUE rb_obj_id(VALUE obj, SEL sel);
+
+void rb_objc_gc_register_thread(void);
+void rb_objc_gc_unregister_thread(void);
+void rb_objc_set_associative_ref(void *, void *, void *);
+void *rb_objc_get_associative_ref(void *, void *);
+
+VALUE rb_io_gets(VALUE, SEL);
+VALUE rb_io_getbyte(VALUE, SEL);
+VALUE rb_io_ungetc(VALUE, SEL, VALUE);
+VALUE rb_io_flush(VALUE, SEL);
+VALUE rb_io_eof(VALUE, SEL);
+VALUE rb_io_binmode(VALUE, SEL);
+VALUE rb_io_addstr(VALUE, SEL, VALUE);
+VALUE rb_io_printf(VALUE, SEL, int, VALUE *);
+VALUE rb_io_print(VALUE, SEL, int, VALUE *);
+
+VALUE rb_objc_num_coerce_bin(VALUE x, VALUE Y, SEL sel);
+VALUE rb_objc_num_coerce_cmp(VALUE, VALUE, SEL sel);
+VALUE rb_objc_num_coerce_relop(VALUE, VALUE, SEL sel);
+
+VALUE rb_f_kill(VALUE, SEL, int, VALUE*);
+VALUE rb_struct_initialize(VALUE, SEL, VALUE);
+VALUE rb_class_real(VALUE, bool hide_builtin_foundation_classes);
+void rb_range_extract(VALUE range, VALUE *begp, VALUE *endp, bool *exclude);
+VALUE rb_cvar_get2(VALUE klass, ID id, bool check);
+
+VALUE rb_require_framework(VALUE, SEL, int, VALUE *);
+
+RUBY_EXTERN VALUE rb_cNSObject;
+RUBY_EXTERN VALUE rb_cRubyObject;
+RUBY_EXTERN VALUE rb_cNSString;
+RUBY_EXTERN VALUE rb_cNSMutableString;
+RUBY_EXTERN VALUE rb_cRubyString;
+RUBY_EXTERN VALUE rb_cNSArray;
+RUBY_EXTERN VALUE rb_cNSMutableArray;
+RUBY_EXTERN VALUE rb_cRubyArray;
+RUBY_EXTERN VALUE rb_cNSHash;
+RUBY_EXTERN VALUE rb_cNSMutableHash;
+RUBY_EXTERN VALUE rb_cRubyHash;
+RUBY_EXTERN VALUE rb_cNSNumber;
+RUBY_EXTERN VALUE rb_cNSDate;
+RUBY_EXTERN VALUE rb_cBoxed;
+RUBY_EXTERN VALUE rb_cPointer;
+RUBY_EXTERN VALUE rb_cTopLevel;
+
+long rb_objc_flag_get_mask(const void *);
+void rb_objc_flag_set(const void *, int, bool);
+bool rb_objc_flag_check(const void *, int);
+
+#if defined(__cplusplus)
+}  // extern "C" {
+#endif
+
+#endif /* __MACRUBY_INTERNAL_H */

Modified: MacRuby/trunk/main.cpp
===================================================================
--- MacRuby/trunk/main.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/main.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 #include "llvm.h"
 
 #undef RUBY_EXPORT
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #ifdef HAVE_LOCALE_H
 #include <locale.h>

Modified: MacRuby/trunk/marshal.c
===================================================================
--- MacRuby/trunk/marshal.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/marshal.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/io.h"
 #include "ruby/st.h"
 #include "ruby/util.h"

Modified: MacRuby/trunk/math.c
===================================================================
--- MacRuby/trunk/math.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/math.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include <math.h>
 #include <errno.h>
 

Modified: MacRuby/trunk/numeric.c
===================================================================
--- MacRuby/trunk/numeric.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/numeric.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  * Copyright (C) 1993-2007 Yukihiro Matsumoto
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include <ctype.h>
 #include <math.h>

Modified: MacRuby/trunk/objc.m
===================================================================
--- MacRuby/trunk/objc.m	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/objc.m	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  */
 
 #include <Foundation/Foundation.h>
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/encoding.h"
 #include "ruby/objc.h"

Modified: MacRuby/trunk/object.c
===================================================================
--- MacRuby/trunk/object.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/object.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/st.h"
 #include "ruby/util.h"
 #include "ruby/node.h"

Modified: MacRuby/trunk/pack.c
===================================================================
--- MacRuby/trunk/pack.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/pack.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "encoding.h"

Modified: MacRuby/trunk/parse.y
===================================================================
--- MacRuby/trunk/parse.y	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/parse.y	2011-01-08 03:18:10 UTC (rev 5137)
@@ -15,7 +15,7 @@
 #define YYERROR_VERBOSE 1
 #define YYSTACK_USE_ALLOCA 0
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/intern.h"
 #define __IN_PARSE_Y__ 1
 #include "ruby/node.h"

Modified: MacRuby/trunk/prec.c
===================================================================
--- MacRuby/trunk/prec.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/prec.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 VALUE rb_mPrecision;
 

Modified: MacRuby/trunk/proc.c
===================================================================
--- MacRuby/trunk/proc.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/proc.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  * Copyright (C) 2004-2007 Koichi Sasada
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "class.h"

Modified: MacRuby/trunk/process.c
===================================================================
--- MacRuby/trunk/process.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/process.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/signal.h"
 #include "ruby/io.h"
 #include "ruby/util.h"

Modified: MacRuby/trunk/rakelib/builder/builder.rb
===================================================================
--- MacRuby/trunk/rakelib/builder/builder.rb	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/rakelib/builder/builder.rb	2011-01-08 03:18:10 UTC (rev 5137)
@@ -235,7 +235,7 @@
     # * install
     # * clean
     def make_command(target)
-      cmd = "cd #{dir} && /usr/bin/make top_srcdir=#{srcdir} ruby=\"#{srcdir}/miniruby -I#{srcdir} -I#{srcdir}/lib\" extout=#{srcdir}/.ext hdrdir=#{srcdir}/include arch_hdrdir=#{srcdir}/include"
+      cmd = "cd #{dir} && /usr/bin/make top_srcdir=#{srcdir} ruby=\"#{srcdir}/miniruby -I#{srcdir} -I#{srcdir}/lib\" extout=#{srcdir}/.ext hdrdir=#{srcdir}/include arch_hdrdir=#{srcdir}/include hdrdir2=#{srcdir}"
       cmd << (target == :all ? " libdir=#{srcdir}" : " #{target}")
       cmd
     end

Modified: MacRuby/trunk/random.c
===================================================================
--- MacRuby/trunk/random.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/random.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  * Copyright (C) 1993-2007 Yukihiro Matsumoto
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "id.h"

Modified: MacRuby/trunk/range.c
===================================================================
--- MacRuby/trunk/range.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/range.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "ruby/node.h"
 #include "vm.h"

Modified: MacRuby/trunk/rational.c
===================================================================
--- MacRuby/trunk/rational.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/rational.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -5,7 +5,7 @@
   which is written in ruby.
 */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 

Modified: MacRuby/trunk/re.c
===================================================================
--- MacRuby/trunk/re.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/re.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 #include "unicode/uregex.h"
 #include "unicode/ustring.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 #include "objc.h"

Modified: MacRuby/trunk/ruby.c
===================================================================
--- MacRuby/trunk/ruby.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ruby.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -18,7 +18,7 @@
 #include <fcntl.h>
 #include <sys/param.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/encoding.h"
 #include "dln.h"

Modified: MacRuby/trunk/sandbox.c
===================================================================
--- MacRuby/trunk/sandbox.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/sandbox.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  */
 
 #include <sandbox.h>
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/util.h"
 
 static VALUE rb_cSandbox;

Modified: MacRuby/trunk/signal.c
===================================================================
--- MacRuby/trunk/signal.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/signal.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -13,7 +13,7 @@
 
 // TODO: rewrite me!
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/signal.h"
 #include "ruby/node.h"
 #include "id.h"

Modified: MacRuby/trunk/sprintf.c
===================================================================
--- MacRuby/trunk/sprintf.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/sprintf.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 #include <stdarg.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 

Modified: MacRuby/trunk/st.c
===================================================================
--- MacRuby/trunk/st.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/st.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 #include "ruby/config.h"
 #include "ruby/defines.h"
 #include "ruby/st.h"
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #endif
 
 #include <stdio.h>

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/string.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -14,7 +14,7 @@
 #include <wctype.h>
 #include <unistd.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 #include "re.h"

Modified: MacRuby/trunk/struct.c
===================================================================
--- MacRuby/trunk/struct.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/struct.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "class.h"

Modified: MacRuby/trunk/symbol.c
===================================================================
--- MacRuby/trunk/symbol.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/symbol.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -8,7 +8,7 @@
 
 #include <wctype.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 #include "symbol.h"

Modified: MacRuby/trunk/thread.c
===================================================================
--- MacRuby/trunk/thread.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/thread.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -7,7 +7,7 @@
  * Copyright (C) 2004-2007 Koichi Sasada
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "vm.h"
 #include "objc.h"

Modified: MacRuby/trunk/time.c
===================================================================
--- MacRuby/trunk/time.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/time.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <math.h>
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 #include "objc.h"

Modified: MacRuby/trunk/transcode.c
===================================================================
--- MacRuby/trunk/transcode.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/transcode.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -12,7 +12,7 @@
 // Notes:
 // AFAICT, we need to add support for newline decorators.
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/encoding.h"
 #include "encoding.h"
 

Modified: MacRuby/trunk/ucnv.c
===================================================================
--- MacRuby/trunk/ucnv.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/ucnv.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
  * Copyright (C) 2000 Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "encoding_ucnv.h"
 #include "unicode/ucnv.h"
 

Modified: MacRuby/trunk/util.c
===================================================================
--- MacRuby/trunk/util.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/util.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 
 #include <ctype.h>
 #include <stdio.h>

Modified: MacRuby/trunk/variable.c
===================================================================
--- MacRuby/trunk/variable.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/variable.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -6,7 +6,7 @@
  * Copyright (C) 2000  Information-technology Promotion Agency, Japan
  */
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/st.h"
 #include "ruby/util.h"

Modified: MacRuby/trunk/version.c
===================================================================
--- MacRuby/trunk/version.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/version.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "version.h"
 #include "revision.h"
 #include <stdio.h>

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/vm.cpp	2011-01-08 03:18:10 UTC (rev 5137)
@@ -49,7 +49,7 @@
 # include <mach/mach_time.h>
 #endif
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "id.h"
 #include "vm.h"

Modified: MacRuby/trunk/vm_eval.c
===================================================================
--- MacRuby/trunk/vm_eval.c	2011-01-08 02:04:16 UTC (rev 5136)
+++ MacRuby/trunk/vm_eval.c	2011-01-08 03:18:10 UTC (rev 5137)
@@ -11,7 +11,7 @@
 
 **********************************************************************/
 
-#include "ruby/macruby.h"
+#include "macruby_internal.h"
 #include "ruby/node.h"
 #include "ruby/st.h"
 #include "vm.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20110107/686a9eec/attachment-0001.html>

More information about the macruby-changes mailing list