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

src/trusted/plugin/shared_memory.cc

Index: src/trusted/plugin/shared_memory.cc
===================================================================
--- src/trusted/plugin/shared_memory.cc	(revision 3898)
+++ src/trusted/plugin/shared_memory.cc	(working copy)
@@ -102,7 +102,7 @@
   *out = 0;
 
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_STRING;
-  params->outs()[0]->u.sval.str = ret_string;
+  params->outs()[0]->arrays.str = ret_string;
 
   return true;
 }
@@ -147,9 +147,9 @@
   // characters with character codes between 0 and 255 inclusive.
   NaClSrpcArg* str_param = params->ins()[2];
   const unsigned char* str =
-    reinterpret_cast<unsigned const char*>(str_param->u.sval.str);
+    reinterpret_cast<unsigned const char*>(str_param->arrays.str);
   uint32_t utf_bytes =
-      nacl::saturate_cast<uint32_t>(strlen(str_param->u.sval.str));
+      nacl::saturate_cast<uint32_t>(strlen(str_param->arrays.str));
   unsigned char* shm_addr =
     reinterpret_cast<unsigned char*>(shared_memory->shm_addr()) + offset;