Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[#667] - Integrate 1.9.1 ruby code

  • Loading branch information...
commit e88e60aa87084d63f40c3108e1c06f58d5277816 1 parent 47fdb2f
@genywind genywind authored
View
1  .gitignore
@@ -1,6 +1,7 @@
*~
*.iseq
.DS_Store
+platform/mac/**/build/*
platform/iphone/build/*
platform/iphone/rhorubylib/build/*
platform/iphone/rhosynclib/build/*
View
2  platform/iphone/Classes/Dispatcher/Dispatcher.c
@@ -9,7 +9,7 @@
#include <sys/types.h>
#include <string.h>
-#include "rhoruby.h"
+#include "ruby/ext/rho/rhoruby.h"
#include "defs.h"
#include "HttpContext.h"
View
2  platform/iphone/Classes/Phonebook/phonebook.m
@@ -7,7 +7,7 @@
*
*/
-#include "rhoruby.h"
+#include "ruby/ext/rho/rhoruby.h"
#include "ruby/ext/phonebook/phonebook.h"
#include "phonebook.h"
View
2  platform/iphone/Classes/Server/ServerHost.m
@@ -11,7 +11,7 @@
#include <assert.h>
#include <unistd.h>
-#include "rhoruby.h"
+#include "ruby/ext/rho/rhoruby.h"
#include "defs.h"
#include "Server.h"
View
2  platform/iphone/Classes/WebViewController.m
@@ -1,5 +1,5 @@
#import "WebViewController.h"
-#import "rhoruby.h"
+#import "ruby/ext/rho/rhoruby.h"
//#import "UniversalLock.h"
#import "common/RhoConf.h"
#import "sync/syncthread.h"
View
52 platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj
@@ -9,8 +9,11 @@
/* Begin PBXBuildFile section */
4678FCCC0F8187A10054340C /* network.c in Sources */ = {isa = PBXBuildFile; fileRef = 4678FCCA0F8187A10054340C /* network.c */; };
4678FCCD0F8187A10054340C /* network.h in Headers */ = {isa = PBXBuildFile; fileRef = 4678FCCB0F8187A10054340C /* network.h */; };
- 5C043EB80EF7B7FB0014E5C6 /* rhosupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C043EB70EF7B7FB0014E5C6 /* rhosupport.c */; };
5C2E6F470F30E05700CCFE20 /* geolocation_rhowrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E6F460F30E05700CCFE20 /* geolocation_rhowrap.c */; };
+ 5C76527E0FD3E3C100CB43FD /* rhoruby.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C76527B0FD3E3C100CB43FD /* rhoruby.c */; };
+ 5C76527F0FD3E3C100CB43FD /* rhoruby.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C76527C0FD3E3C100CB43FD /* rhoruby.h */; };
+ 5C7652800FD3E3C100CB43FD /* rhosupport.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C76527D0FD3E3C100CB43FD /* rhosupport.c */; };
+ 5C7652830FD3E3E000CB43FD /* stringio.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C7652820FD3E3E000CB43FD /* stringio.c */; };
F5177F180EE5B624000EA1A0 /* system_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5177F170EE5B624000EA1A0 /* system_wrap.c */; };
F5177F210EE5C940000EA1A0 /* system_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = F5177F1F0EE5C940000EA1A0 /* system_properties.c */; };
F5177F220EE5C940000EA1A0 /* system_properties.h in Headers */ = {isa = PBXBuildFile; fileRef = F5177F200EE5C940000EA1A0 /* system_properties.h */; };
@@ -96,8 +99,6 @@
F5E360C20EB6A74D00226287 /* strscan.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E360C10EB6A74D00226287 /* strscan.c */; };
F5E360C50EB6A77C00226287 /* syncengine_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E360C40EB6A77C00226287 /* syncengine_wrap.c */; };
F5E360C80EB6A7AF00226287 /* parse.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E360C70EB6A7AF00226287 /* parse.c */; };
- F5E360CD0EB6A7F900226287 /* rhoruby.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E360CB0EB6A7F900226287 /* rhoruby.c */; };
- F5E360CE0EB6A7F900226287 /* rhoruby.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E360CC0EB6A7F900226287 /* rhoruby.h */; };
F5E360D40EB6A84600226287 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E360D30EB6A84600226287 /* config.h */; };
F5E362410EB785C100226287 /* crt_externs.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E362400EB785C100226287 /* crt_externs.h */; };
F5E362980EB7927100226287 /* thread_pthread.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E362960EB7927100226287 /* thread_pthread.c */; };
@@ -110,8 +111,11 @@
/* Begin PBXFileReference section */
4678FCCA0F8187A10054340C /* network.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = network.c; path = ../../shared/ruby/ext/system/network.c; sourceTree = SOURCE_ROOT; };
4678FCCB0F8187A10054340C /* network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = network.h; path = ../../shared/ruby/ext/system/network.h; sourceTree = SOURCE_ROOT; };
- 5C043EB70EF7B7FB0014E5C6 /* rhosupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhosupport.c; path = ext/rhosupport/rhosupport.c; sourceTree = "<group>"; };
5C2E6F460F30E05700CCFE20 /* geolocation_rhowrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = geolocation_rhowrap.c; path = ext/geolocation/geolocation_rhowrap.c; sourceTree = "<group>"; };
+ 5C76527B0FD3E3C100CB43FD /* rhoruby.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhoruby.c; path = ext/rho/rhoruby.c; sourceTree = "<group>"; };
+ 5C76527C0FD3E3C100CB43FD /* rhoruby.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhoruby.h; path = ext/rho/rhoruby.h; sourceTree = "<group>"; };
+ 5C76527D0FD3E3C100CB43FD /* rhosupport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhosupport.c; path = ext/rho/rhosupport.c; sourceTree = "<group>"; };
+ 5C7652820FD3E3E000CB43FD /* stringio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stringio.c; path = ext/stringio/stringio.c; sourceTree = "<group>"; };
D2AAC046055464E500DB518D /* librhorubylib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librhorubylib.a; sourceTree = BUILT_PRODUCTS_DIR; };
F5177F170EE5B624000EA1A0 /* system_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_wrap.c; path = ../../shared/ruby/ext/system/system_wrap.c; sourceTree = SOURCE_ROOT; };
F5177F1F0EE5C940000EA1A0 /* system_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = system_properties.c; path = ../../shared/ruby/ext/system/system_properties.c; sourceTree = SOURCE_ROOT; };
@@ -198,8 +202,6 @@
F5E360C10EB6A74D00226287 /* strscan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strscan.c; path = ../../shared/ruby/ext/strscan/strscan.c; sourceTree = SOURCE_ROOT; };
F5E360C40EB6A77C00226287 /* syncengine_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = syncengine_wrap.c; path = ../../shared/ruby/ext/syncengine/syncengine_wrap.c; sourceTree = SOURCE_ROOT; };
F5E360C70EB6A7AF00226287 /* parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = parse.c; path = ../../shared/ruby/generated/parse.c; sourceTree = SOURCE_ROOT; };
- F5E360CB0EB6A7F900226287 /* rhoruby.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhoruby.c; path = ../../shared/ruby/rhoruby/rhoruby.c; sourceTree = SOURCE_ROOT; };
- F5E360CC0EB6A7F900226287 /* rhoruby.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhoruby.h; path = ../../shared/ruby/rhoruby/rhoruby.h; sourceTree = SOURCE_ROOT; };
F5E360D30EB6A84600226287 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../shared/ruby/iphone/ruby/config.h; sourceTree = SOURCE_ROOT; };
F5E362400EB785C100226287 /* crt_externs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crt_externs.h; path = ../../shared/ruby/iphone/crt_externs.h; sourceTree = SOURCE_ROOT; };
F5E362960EB7927100226287 /* thread_pthread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = thread_pthread.c; path = ../../shared/ruby/thread_pthread.c; sourceTree = SOURCE_ROOT; };
@@ -238,12 +240,22 @@
name = Products;
sourceTree = "<group>";
};
- 5C043EB60EF7B7CF0014E5C6 /* rhosupport */ = {
+ 5C043EB60EF7B7CF0014E5C6 /* rho */ = {
isa = PBXGroup;
children = (
- 5C043EB70EF7B7FB0014E5C6 /* rhosupport.c */,
+ 5C76527B0FD3E3C100CB43FD /* rhoruby.c */,
+ 5C76527C0FD3E3C100CB43FD /* rhoruby.h */,
+ 5C76527D0FD3E3C100CB43FD /* rhosupport.c */,
);
- name = rhosupport;
+ name = rho;
+ sourceTree = "<group>";
+ };
+ 5C7652810FD3E3C500CB43FD /* stringio */ = {
+ isa = PBXGroup;
+ children = (
+ 5C7652820FD3E3E000CB43FD /* stringio.c */,
+ );
+ name = stringio;
sourceTree = "<group>";
};
C6A0FF2B0290797F04C91782 /* Documentation */ = {
@@ -277,7 +289,6 @@
isa = PBXGroup;
children = (
F5E360CF0EB6A80900226287 /* iphone */,
- F5E360CA0EB6A7E300226287 /* rhoruby */,
F5E360C90EB6A7BC00226287 /* missing */,
F5E360C60EB6A79800226287 /* generated */,
F5E360B10EB6A67000226287 /* enc */,
@@ -381,10 +392,11 @@
F5E360B00EB6A63B00226287 /* ext */ = {
isa = PBXGroup;
children = (
+ 5C7652810FD3E3C500CB43FD /* stringio */,
F5B8FACD0F44E8F900C9AF85 /* camera */,
F5C61CA60F3CFE5700207621 /* webview */,
F58E7FE50F008A8500E46829 /* phonebook */,
- 5C043EB60EF7B7CF0014E5C6 /* rhosupport */,
+ 5C043EB60EF7B7CF0014E5C6 /* rho */,
F5177F150EE5B5D9000EA1A0 /* system */,
F5E360C30EB6A76500226287 /* syncengine */,
F5E360C00EB6A71100226287 /* strscan */,
@@ -453,15 +465,6 @@
name = missing;
sourceTree = "<group>";
};
- F5E360CA0EB6A7E300226287 /* rhoruby */ = {
- isa = PBXGroup;
- children = (
- F5E360CB0EB6A7F900226287 /* rhoruby.c */,
- F5E360CC0EB6A7F900226287 /* rhoruby.h */,
- );
- name = rhoruby;
- sourceTree = "<group>";
- };
F5E360CF0EB6A80900226287 /* iphone */ = {
isa = PBXGroup;
children = (
@@ -500,12 +503,12 @@
F5E360AB0EB6A62A00226287 /* version.h in Headers */,
F5E360AD0EB6A62A00226287 /* vm_core.h in Headers */,
F5E360AF0EB6A62A00226287 /* vm_opts.h in Headers */,
- F5E360CE0EB6A7F900226287 /* rhoruby.h in Headers */,
F5E360D40EB6A84600226287 /* config.h in Headers */,
F5E362410EB785C100226287 /* crt_externs.h in Headers */,
F5E362990EB7927100226287 /* thread_pthread.h in Headers */,
F5177F220EE5C940000EA1A0 /* system_properties.h in Headers */,
4678FCCD0F8187A10054340C /* network.h in Headers */,
+ 5C76527F0FD3E3C100CB43FD /* rhoruby.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -616,19 +619,20 @@
F5E360C20EB6A74D00226287 /* strscan.c in Sources */,
F5E360C50EB6A77C00226287 /* syncengine_wrap.c in Sources */,
F5E360C80EB6A7AF00226287 /* parse.c in Sources */,
- F5E360CD0EB6A7F900226287 /* rhoruby.c in Sources */,
F5E362980EB7927100226287 /* thread_pthread.c in Sources */,
F5E362FF0EB79F0200226287 /* miniprelude.c in Sources */,
F5E363050EB79F8400226287 /* lgamma_r.c in Sources */,
F5E363080EB7A0DB00226287 /* newline.c in Sources */,
F5177F180EE5B624000EA1A0 /* system_wrap.c in Sources */,
F5177F210EE5C940000EA1A0 /* system_properties.c in Sources */,
- 5C043EB80EF7B7FB0014E5C6 /* rhosupport.c in Sources */,
F58E7FE80F008AA600E46829 /* phonebook_wrap.c in Sources */,
5C2E6F470F30E05700CCFE20 /* geolocation_rhowrap.c in Sources */,
F5C61CAA0F3CFE7800207621 /* webview_wrap.c in Sources */,
F5B8FACF0F44E92700C9AF85 /* camera_wrap.c in Sources */,
4678FCCC0F8187A10054340C /* network.c in Sources */,
+ 5C76527E0FD3E3C100CB43FD /* rhoruby.c in Sources */,
+ 5C7652800FD3E3C100CB43FD /* rhosupport.c in Sources */,
+ 5C7652830FD3E3E000CB43FD /* stringio.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -654,7 +658,7 @@
);
INSTALL_PATH = /usr/local/lib;
PRODUCT_NAME = rhorubylib;
- SDKROOT = iphoneos2.1;
+ SDKROOT = macosx10.5;
SYMROOT = ../build;
};
name = Debug;
View
12 platform/mac/RubyMac/RubyMac.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
/* Begin PBXBuildFile section */
5C0440920EF7DC550014E5C6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C0440910EF7DC550014E5C6 /* main.c */; };
5C0440C20EF7E3230014E5C6 /* libsqlite3.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0440C10EF7E3230014E5C6 /* libsqlite3.0.dylib */; };
- 5C0440F60EF7E72A0014E5C6 /* librhorubylib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C0440F50EF7E72A0014E5C6 /* librhorubylib.a */; };
8DD76F6A0486A84900D96B5E /* RubyMac.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6859E8B029090EE04C91782 /* RubyMac.1 */; };
/* End PBXBuildFile section */
@@ -47,7 +46,6 @@
5C04408B0EF7DC290014E5C6 /* rhorubylib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = rhorubylib.xcodeproj; path = ../../iphone/rhorubylib/rhorubylib.xcodeproj; sourceTree = SOURCE_ROOT; };
5C0440910EF7DC550014E5C6 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../shared/ruby/main.c; sourceTree = SOURCE_ROOT; };
5C0440C10EF7E3230014E5C6 /* libsqlite3.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.0.dylib; path = usr/lib/libsqlite3.0.dylib; sourceTree = SDKROOT; };
- 5C0440F50EF7E72A0014E5C6 /* librhorubylib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librhorubylib.a; path = ../../iphone/build/Debug/librhorubylib.a; sourceTree = SOURCE_ROOT; };
8DD76F6C0486A84900D96B5E /* RubyMac */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = RubyMac; sourceTree = BUILT_PRODUCTS_DIR; };
C6859E8B029090EE04C91782 /* RubyMac.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = RubyMac.1; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -58,7 +56,6 @@
buildActionMask = 2147483647;
files = (
5C0440C20EF7E3230014E5C6 /* libsqlite3.0.dylib in Frameworks */,
- 5C0440F60EF7E72A0014E5C6 /* librhorubylib.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -68,7 +65,6 @@
08FB7794FE84155DC02AAC07 /* RubyMac */ = {
isa = PBXGroup;
children = (
- 5C0440F50EF7E72A0014E5C6 /* librhorubylib.a */,
5C04408B0EF7DC290014E5C6 /* rhorubylib.xcodeproj */,
08FB7795FE84155DC02AAC07 /* Source */,
C6859E8C029090F304C91782 /* Documentation */,
@@ -204,8 +200,10 @@
"\"$(SRCROOT)/../../iphone/build/Debug\"",
"\"$(SRCROOT)/../../iphone/build/Release\"",
);
- OTHER_LDFLAGS = "";
+ OTHER_LDFLAGS = "-lrhorubylib";
PRODUCT_NAME = RubyMac;
+ SYMROOT = build;
+ USER_HEADER_SEARCH_PATHS = "../../shared ../../shared/ruby/iphone ../../shared/ruby/include ../../shared/ruby";
};
name = Debug;
};
@@ -221,8 +219,9 @@
"\"$(SRCROOT)/../../iphone/build/Debug\"",
"\"$(SRCROOT)/../../iphone/build/Release\"",
);
- OTHER_LDFLAGS = "";
+ OTHER_LDFLAGS = "-lrhorubylib";
PRODUCT_NAME = RubyMac;
+ USER_HEADER_SEARCH_PATHS = "../../shared ../../shared/ruby/iphone ../../shared/ruby/include ../../shared/ruby";
};
name = Release;
};
@@ -249,6 +248,7 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lrhorubylib";
PREBINDING = NO;
SDKROOT = macosx10.5;
View
BIN  platform/mac/target/compiler/RubyMac
Binary file not shown
View
5 platform/shared/ruby/file.c
@@ -70,6 +70,11 @@ int flock(int, int);
#define lstat stat
#endif
+//RHO
+static int
+file_load_ok(const char *path);
+//RHO
+
#ifdef __BEOS__ /* should not change ID if -1 */
static int
be_chown(const char *path, uid_t owner, gid_t group)
View
4 platform/shared/ruby/include/ruby/intern.h
@@ -535,7 +535,9 @@ void ruby_script(const char*);
void ruby_prog_init(void);
void ruby_set_argv(int, char**);
void *ruby_process_options(int, char**);
-void ruby_init_loadpath(void);
+//RHO
+void ruby_init_loadpath(const char* szRoot);
+//RHO
void ruby_incpush(const char*);
/* signal.c */
VALUE rb_f_kill(int, VALUE*);
View
17 platform/shared/ruby/iphone/ruby/config.h
@@ -3,8 +3,8 @@
#define PACKAGE_VERSION ""
#define PACKAGE_STRING ""
#define PACKAGE_BUGREPORT ""
+#define CANONICALIZATION_FOR_MATHN 1
#define USE_BUILTIN_FRAME_ADDRESS 1
-#define _GNU_SOURCE 1
#define STDC_HEADERS 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_SYS_STAT_H 1
@@ -16,6 +16,8 @@
#define HAVE_STDINT_H 1
#define HAVE_UNISTD_H 1
#define __EXTENSIONS__ 1
+#define _ALL_SOURCE 1
+#define _GNU_SOURCE 1
#define _POSIX_PTHREAD_SEMANTICS 1
#define _TANDEM_SOURCE 1
#define HAVE_LONG_LONG 1
@@ -55,11 +57,7 @@
#define BROKEN_CRYPT 1
#define HAVE_LIBDL 1
#define HAVE_DIRENT_H 1
-#define STDC_HEADERS 1
#define HAVE_SYS_WAIT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_UNISTD_H 1
#define HAVE_LIMITS_H 1
#define HAVE_SYS_FILE_H 1
#define HAVE_SYS_IOCTL_H 1
@@ -73,12 +71,10 @@
#define HAVE_PWD_H 1
#define HAVE_GRP_H 1
#define HAVE_UTIME_H 1
-#define HAVE_MEMORY_H 1
#define HAVE_SYS_RESOURCE_H 1
#define HAVE_NETINET_IN_SYSTM_H 1
#define HAVE_FLOAT_H 1
#define HAVE_PTHREAD_H 1
-#define HAVE_UCONTEXT_H 1
#define HAVE_LANGINFO_H 1
#define HAVE_LOCALE_H 1
#define HAVE_TIME_H 1
@@ -121,7 +117,7 @@
#define HAVE_FLOCK 1
#define HAVE_VSNPRINTF 1
#define HAVE_ISNAN 1
-#define HAVE_FINITE 0
+#define HAVE_FINITE 1
#define HAVE_ISINF 1
#define HAVE_HYPOT 1
#define HAVE_ACOSH 1
@@ -178,7 +174,6 @@
#define HAVE_SIGSETJMP 1
#define HAVE__SETJMP 1
#define HAVE__LONGJMP 1
-#define HAVE_VSNPRINTF 1
#define HAVE_SNPRINTF 1
#define HAVE_SETSID 1
#define HAVE_TELLDIR 1
@@ -191,7 +186,6 @@
#define HAVE_ROUND 1
#define HAVE_SETUID 1
#define HAVE_SETGID 1
-#define HAVE_DAEMON 1
#define HAVE_SETENV 1
#define HAVE_UNSETENV 1
#define HAVE_MKTIME 1
@@ -201,6 +195,7 @@
#define HAVE_PREAD 1
#define HAVE_SENDFILE 1
#define HAVE_SHUTDOWN 1
+#define HAVE_SIGALTSTACK 1
#define RUBY_SETJMP(env) _setjmp(env)
#define RUBY_LONGJMP(env,val) _longjmp(env,val)
#define RUBY_JMP_BUF jmp_buf
@@ -227,8 +222,6 @@
#define HAVE_NANOSLEEP 1
#define HAVE_SCHED_YIELD 1
#define HAVE_PTHREAD_ATTR_SETINHERITSCHED 1
-#define HAVE_GETCONTEXT 1
-#define HAVE_SETCONTEXT 1
#define HAVE_BACKTRACE 1
#define DLEXT_MAXLEN 7
#define DLEXT ".bundle"
View
9 platform/shared/ruby/main.c
@@ -26,7 +26,7 @@ extern void Init_SyncEngine(void);
if (rb_safe_level() == 0) {
ruby_incpush(getenv("RUBYLIB"));
}
-[04.01.2009 11:44:19] evgeny vovchenko says: ýòî íàäî óáðàòü
+[04.01.2009 11:44:19] evgeny vovchenko says: ˝ÚÓ Ì‡‰Ó Û·‡Ú¸
[04.01.2009 11:44:35] evgeny vovchenko says: ruby_init_gems(!(opt->disable & DISABLE_BIT(gems)));
*/
//RUBY_GLOBAL_SETUP
@@ -105,11 +105,12 @@ __rho_compile( VALUE obj, VALUE src)
return result;
}
-/*
+#ifdef __APPLE__
const char* RhoGetRootPath()
{
- return 0;
-}*/
+ return "";
+}
+#endif //__APPLE__
#endif //!COMPILER
/*
Please sign in to comment.
Something went wrong with that request. Please try again.