1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on

Browse Source 
other architectures than x86_64. Fixes #6873.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2012-08-22 01:14:14 +00:00
parent 0d05a79bca
commit 1497959ef5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 16 12:09:51 2012 Yuki Yugui Sonoda <yugui@google.com>
* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
other architectures than x86_64. Fixes #6873.
Wed Aug 15 19:37:33 2012 Yuki Yugui Sonoda <yugui@google.com> Wed Aug 15 19:37:33 2012 Yuki Yugui Sonoda <yugui@google.com>
* configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy * configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy

6
nacl/pepper_main.c
View File

@ -26,7 +26,9 @@
#include "ppapi/c/ppp_instance.h" #include "ppapi/c/ppp_instance.h"
#include "ppapi/c/ppp_messaging.h" #include "ppapi/c/ppp_messaging.h"
#include "verconf.h"
#include "ruby/ruby.h" #include "ruby/ruby.h"
#include "version.h"
#include "gc.h" #include "gc.h"
#ifdef HAVE_STRUCT_PPB_CORE #ifdef HAVE_STRUCT_PPB_CORE
@ -339,8 +341,8 @@ pruby_post_value(void* data)
static void static void
init_loadpath(void) init_loadpath(void)
{ {
ruby_incpush("lib/ruby/2.0.0"); ruby_incpush("lib/ruby/"RUBY_LIB_VERSION);
ruby_incpush("lib/ruby/2.0.0/x86_64-nacl"); ruby_incpush("lib/ruby/"RUBY_LIB_VERSION"/"RUBY_PLATFORM);
ruby_incpush("."); ruby_incpush(".");
} }