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

tests/srpc/srpc_bidir.c

Index: tests/srpc/srpc_bidir.c
===================================================================
--- tests/srpc/srpc_bidir.c	(revision 3855)
+++ tests/srpc/srpc_bidir.c	(working copy)
@@ -18,7 +18,7 @@
                        NaClSrpcArg **in_args,
                        NaClSrpcArg **out_args,
                        NaClSrpcClosure *done) {
-  const char* sd_string = (const char*) in_args[0]->u.sval.str;
+  const char* sd_string = (const char*) in_args[0]->arrays.str;
   NaClSrpcService* service;
   rpc->result = NACL_SRPC_RESULT_APP_ERROR;
   printf("SetUpcallServices: %s\n", sd_string);
@@ -46,7 +46,7 @@
                 NaClSrpcArg **in_args,
                 NaClSrpcArg **out_args,
                 NaClSrpcClosure *done) {
-  const char* method_name = (const char*) in_args[0]->u.sval.str;
+  const char* method_name = (const char*) in_args[0]->arrays.str;
   NaClSrpcError retval;
 
   printf("Testing upcall to method: '%s'\n", method_name);