Restructure the structs/unions involved in SRPC argument passing. This will...

tests/ruby/main.c

 /* Copyright 2009 The Native Client Authors.  All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file. */
 
 #include <stdio.h>
 #include <string.h>
 #include <nacl/nacl_srpc.h>
 #include "ruby-1.8.6-p368/ruby.h"
 
 int initialized = 0;
@@ skipping 27 matching lines @@
               NaClSrpcArg **in_args,
               NaClSrpcArg **out_args,
               NaClSrpcClosure *done) {
 
   /* TODO(krasin): MAKE IT THREAD-SAFE */
   if (!initialized) {
     ruby_init();
     rb_eval_string(INIT_RUBY_SCRIPT);
     initialized = 1;
   }
-  rb_eval_string(in_args[0]->u.sval);
+  rb_eval_string(in_args[0]->arrays.str);
   VALUE result = rb_eval_string("$stdout_logger.get_string()");
 
   /*
    * Strdup must be used because the SRPC layer frees the string passed to it.
    */
-  out_args[0]->u.sval = strdup(StringValuePtr(result));
+  out_args[0]->arrays.str = strdup(StringValuePtr(result));
 
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 /*
  * Export the method as taking no arguments and returning one integer.
  */
 NACL_SRPC_METHOD("rubyEval:s:s", RubyEval);