Permalink
Browse files

Move Obj-C related headers around.

Snything that is Obj-C related is now in a separate header. This will avoid "true" to already be defined for example.

 - Fixes <rdar://problem/7871199>
 - Fixes #728



git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@4330 23306eb0-4c56-4727-a40e-e92c0eb68959
  • Loading branch information...
1 parent b706890 commit 468a2ea9409671c9a0ebbb324cdee9a93a7540ef Thibault Martin-Lagardette committed Jul 8, 2010
Showing with 249 additions and 220 deletions.
  1. +1 −1 MacRuby.m
  2. +1 −1 NSArray.m
  3. +1 −1 NSDictionary.m
  4. +1 −1 NSString.m
  5. +1 −1 array.c
  6. +1 −1 bignum.c
  7. +1 −1 bridgesupport.cpp
  8. +1 −1 class.c
  9. +1 −1 compar.c
  10. +1 −1 compiler.cpp
  11. +1 −1 complex.c
  12. +1 −1 cont.c
  13. +1 −1 debugger.cpp
  14. +1 −1 dir.c
  15. +3 −1 dispatcher.cpp
  16. +1 −1 dln.c
  17. +1 −1 encoding.c
  18. +1 −1 enum.c
  19. +1 −1 enumerator.c
  20. +1 −1 env.c
  21. +1 −1 error.c
  22. +1 −1 eval.c
  23. +1 −1 ext/bigdecimal/bigdecimal.c
  24. +1 −1 ext/digest/bubblebabble/bubblebabble.c
  25. +1 −1 ext/digest/digest.h
  26. +1 −1 ext/etc/etc.c
  27. +1 −1 ext/json/rubyext.c
  28. +1 −1 ext/libyaml/rubyext.c
  29. +1 −1 ext/nkf/nkf.c
  30. +1 −1 ext/openssl/ossl.h
  31. +1 −1 ext/readline/readline.c
  32. +1 −1 ext/socket/socket.c
  33. +1 −1 ext/zlib/zlib.c
  34. +1 −1 file.c
  35. +1 −1 gc.c
  36. +1 −1 gcd.c
  37. +1 −1 hash.c
  38. +1 −1 id.c
  39. +2 −81 include/ruby/intern.h
  40. +162 −0 include/ruby/macruby.h
  41. +3 −59 include/ruby/ruby.h
  42. +1 −1 inits.c
  43. +1 −1 interpreter.cpp
  44. +3 −3 io.c
  45. +1 −1 kernel.c
  46. +1 −1 load.c
  47. +1 −1 main.cpp
  48. +1 −1 marshal.c
  49. +1 −1 math.c
  50. +1 −1 numeric.c
  51. +1 −1 objc.m
  52. +1 −1 object.c
  53. +1 −1 pack.c
  54. +1 −1 parse.y
  55. +1 −1 prec.c
  56. +1 −1 proc.c
  57. +1 −1 process.c
  58. +1 −1 random.c
  59. +1 −1 range.c
  60. +1 −1 rational.c
  61. +1 −1 re.cpp
  62. +1 −1 ruby.c
  63. +1 −1 signal.c
  64. +1 −1 sprintf.c
  65. +1 −1 st.c
  66. +1 −1 string.c
  67. +1 −1 struct.c
  68. +1 −1 symbol.c
  69. +1 −1 thread.c
  70. +1 −1 time.c
  71. +1 −1 transcode.c
  72. +1 −1 ucnv.c
  73. +1 −1 util.c
  74. +1 −1 variable.c
  75. +1 −1 version.c
  76. +1 −1 vm.cpp
  77. +1 −1 vm_eval.c
  78. +4 −4 vm_method.c
View
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "ruby/objc.h"
#include "vm.h"
View
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "objc.h"
#include "vm.h"
View
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "objc.h"
#include "vm.h"
View
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "objc.h"
#include "vm.h"
View
@@ -9,7 +9,7 @@
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/util.h"
#include "ruby/st.h"
#include "id.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "objc.h"
View
@@ -24,7 +24,7 @@
using namespace llvm;
#endif
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "vm.h"
#include "compiler.h"
View
@@ -9,7 +9,7 @@
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/signal.h"
#include "ruby/node.h"
#include "ruby/st.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "vm.h"
View
@@ -18,7 +18,7 @@
#include <llvm/Transforms/Utils/Cloning.h>
#include "llvm.h"
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/encoding.h"
#include "ruby/node.h"
#include "id.h"
View
@@ -5,7 +5,7 @@
which is written in ruby.
*/
-#include "ruby.h"
+#include "ruby/macruby.h"
#include <math.h>
#include "ruby/node.h"
#include "vm.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
enum context_type {
CONTINUATION_CONTEXT = 0,
View
@@ -24,7 +24,7 @@ using namespace llvm;
#include <sys/socket.h>
#include <sys/un.h>
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "vm.h"
#include "compiler.h"
View
@@ -11,7 +11,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "ruby/util.h"
#include "vm.h"
View
@@ -7,7 +7,7 @@
*/
#include "llvm.h"
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "id.h"
#include "vm.h"
@@ -16,6 +16,8 @@
#include "dtrace.h"
#include "class.h"
+
+
#include <execinfo.h>
#include <dlfcn.h>
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "dln.h"
#include <stdlib.h>
#include <alloca.h>
View
@@ -11,7 +11,7 @@
#include <string.h>
-#include "ruby.h"
+#include "ruby/macruby.h"
#include "ruby/encoding.h"
#include "encoding.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "ruby/util.h"
#include "vm.h"
View
@@ -12,7 +12,7 @@
************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "id.h"
/*
View
@@ -9,7 +9,7 @@
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/st.h"
#include "ruby/util.h"
#include "ruby/node.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/st.h"
#include "ruby/node.h"
#include "vm.h"
View
@@ -9,7 +9,7 @@
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "vm.h"
#include "dtrace.h"
@@ -13,7 +13,7 @@
*
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -11,7 +11,7 @@
************************************************/
-#include "ruby.h"
+#include "ruby/macruby.h"
#include "digest.h"
static ID id_digest;
View
@@ -13,7 +13,7 @@
************************************************/
-#include "ruby.h"
+#include "ruby/macruby.h"
#define RUBY_DIGEST_API_VERSION 2
View
@@ -7,7 +7,7 @@
************************************************/
-#include "ruby.h"
+#include "ruby/macruby.h"
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
View
@@ -8,7 +8,7 @@
*
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/intern.h"
#include "ruby/node.h"
#include "ruby/io.h"
@@ -6,7 +6,7 @@
* Copyright (C) 2009-2010, Apple Inc. All rights reserved.
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/intern.h"
#include "ruby/node.h"
#include "ruby/io.h"
View
@@ -10,7 +10,7 @@
#define RUBY_NKF_REVISION "$Revision: 16493 $"
#define RUBY_NKF_VERSION NKF_VERSION " (" NKF_RELEASE_DATE ")"
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/encoding.h"
/* Replace nkf's getchar/putchar for variable modification */
View
@@ -28,7 +28,7 @@ extern "C" {
#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
# undef RFILE
#endif
-#include <ruby.h>
+#include <ruby/macruby.h>
#include <ruby/io.h>
/*
@@ -33,7 +33,7 @@
#include <editline/readline.h>
#endif
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/io.h"
#ifdef HAVE_UNISTD_H
View
@@ -9,7 +9,7 @@
************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/io.h"
#include "ruby/signal.h"
#include "ruby/util.h"
View
@@ -7,7 +7,7 @@
* Copyright (C) UENO Katsuhiro 2000-2003
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/intern.h"
#include "ruby/node.h"
#include "ruby/io.h"
View
@@ -11,7 +11,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/io.h"
#include "ruby/signal.h"
#include "ruby/util.h"
View
@@ -17,7 +17,7 @@
# include "auto_zone_1060.h"
#endif
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/signal.h"
#include "ruby/st.h"
#include "ruby/node.h"
View
@@ -6,7 +6,7 @@
* Copyright (C) 2009-2010, Apple Inc. All rights reserved.
*/
-#include "ruby.h"
+#include "ruby/macruby.h"
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
View
@@ -9,7 +9,7 @@
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
*/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/st.h"
#include "ruby/util.h"
#include "ruby/signal.h"
View
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "ruby/ruby.h"
+#include "ruby/macruby.h"
#include "ruby/node.h"
#include "vm.h"
Oops, something went wrong.

0 comments on commit 468a2ea

Please sign in to comment.