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

src/trusted/plugin/socket_address.cc

 /*
  * Copyright 2008 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 <signal.h>
 #include <string.h>
 #include "native_client/src/trusted/plugin/browser_interface.h"
 #include "native_client/src/trusted/plugin/connected_socket.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/scriptable_handle.h"
 #include "native_client/src/trusted/plugin/socket_address.h"
 #include "native_client/src/trusted/plugin/utility.h"
 
 namespace {
 
 bool RpcConnect(void* obj, plugin::SrpcParams *params) {
   plugin::SocketAddress* socket_addr =
       reinterpret_cast<plugin::SocketAddress*>(obj);
   plugin::ScriptableHandle* connected_socket = socket_addr->Connect();
   if (NULL == connected_socket) {
     return false;
   }
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
-  params->outs()[0]->u.oval = connected_socket;
+  params->outs()[0]->arrays.oval = connected_socket;
   return true;
 }
 
 }  // namespace
 
 namespace plugin {
 
 SocketAddress* SocketAddress::New(Plugin* plugin, nacl::DescWrapper* wrapper) {
   PLUGIN_PRINTF(("SocketAddress::New (plugin=%p)\n",
                  static_cast<void*>(plugin)));
@@ skipping 43 matching lines @@
     ScriptableHandle* connected_socket =
         plugin()->browser_interface()->NewScriptableHandle(
             portable_connected_socket);
     PLUGIN_PRINTF(("SocketAddress::Connect (connected_socket=%p)\n",
                    static_cast<void*>(connected_socket)));
     return connected_socket;
   }
 }
 
 }  // namespace plugin