diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:11:53 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:11:53 +0000 |
| commit | 69ac654c90178dce12c3365afbc03447a0fccf78 (patch) | |
| tree | 390fb7f7cd6f0888e0c321b8049f0471dd2ca205 /nacl/pepper_main.c | |
| parent | f21431e574b1b27e47d19ff40ce2997783d310e3 (diff) | |
| download | ruby-69ac654c90178dce12c3365afbc03447a0fccf78.tar.gz | |
Merges a patch form naclports.
* configure.in (RUBY_NACL and others): Supports PNaCl.
* dln.c: replace the old hacky dynamic loading over HTTP with nacl_io.
* file.c: tenatively use access(2) instead of eaccess.
(rb_file_load_ok): weaken with attribute but not by postprocess.
* io.c (socket.h): now NaCl has socket.h
(flock): disable here instead of nacl/ioctl.h
* nacl/GNUmakefile.in (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY):
respect path to them if they are absolute.
This helps naclports to build ruby in their source tree.
(PROGRAM_NMF, .SUFFIXES): support .pnexe for PNaCl.
(ruby.o, file.o): move the hack to attributes in ruby.c and file.c
* nacl/ioctl.h: removed. move the hack to io.c.
* nacl/nacl-config.rb: support arm, pnacl and others.
* nacl/pepper_main.c: support build in a naclports tree.
* ruby.c (rb_load_file): weaken with attribute but not by postprocess.
The patch is by sbc@google.com and the Native Client Authors.
It is available at:
* https://chromium.googlesource.com/external/naclports.git/+/873ca4910a5f9d4206306aacb4ed79c587c6a5f3/ports/ruby/nacl.patch
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'nacl/pepper_main.c')
| -rw-r--r-- | nacl/pepper_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c index 1ccafd9332..e8d01ad078 100644 --- a/nacl/pepper_main.c +++ b/nacl/pepper_main.c @@ -210,7 +210,7 @@ pruby_async_return_value(void* data, VALUE value) static struct PP_Var pruby_cstr_to_var(const char* str) { -#ifdef PPB_VAR_INTERFACE_1_0 +#ifndef PPB_VAR_INTERFACE_1_1 if (var_interface != NULL) return var_interface->VarFromUtf8(module_id, str, strlen(str)); return PP_MakeUndefined(); @@ -252,7 +252,7 @@ pruby_str_to_var(volatile VALUE str) fprintf(stderr, "[BUG] Unexpected object type: %x\n", TYPE(str)); exit(EXIT_FAILURE); } -#ifdef PPB_VAR_INTERFACE_1_0 +#ifndef PPB_VAR_INTERFACE_1_1 if (var_interface != NULL) { return var_interface->VarFromUtf8(module_id, RSTRING_PTR(str), RSTRING_LEN(str)); } @@ -517,7 +517,7 @@ static void Instance_DidDestroy(PP_Instance instance) { * the top left of the plugin's coordinate system (not the page). If the * plugin is invisible, @a clip will be (0, 0, 0, 0). */ -#ifdef PPP_INSTANCE_INTERFACE_1_0 +#ifndef PPP_INSTANCE_INTERFACE_1_1 static void Instance_DidChangeView(PP_Instance instance, const struct PP_Rect* position, |