gcc 4.6 fixes for ppapi so that these will build nacl-side. tested

chrome-side by temporarily modifying build/common.gypi and adding
-Wno-unused-but-set-variable and building on an oneiric system.

BUG= http://code.google.com/p/chromium/issues/detail?id=87490

Review URL: http://codereview.chromium.org/8348017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106418 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 8 deletions

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc
index 6ddaad6..c89e149 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_audio_rpc_server.cc
@@ -88,13 +88,12 @@ void StreamCreatedCallback(void* user_data, int32_t result) {
       factory.ImportSyncSocketHandle(nacl_sync_handle));
   NaClDesc *nacl_shm = NaClDescRef(shm_wrapper->desc());
   NaClDesc *nacl_socket = NaClDescRef(socket_wrapper->desc());
-  int r;
-  r = PppAudioRpcClient::PPP_Audio_StreamCreated(
+  static_cast<void>(PppAudioRpcClient::PPP_Audio_StreamCreated(
       ppapi_proxy::GetMainSrpcChannel(data->instance_id),
       data->audio_id,
       nacl_shm,
       shared_memory_size,
-      nacl_socket);
+      nacl_socket));
 }
 
 }  // namespace
diff --git a/ppapi/native_client/src/trusted/plugin/srpc_client.cc b/ppapi/native_client/src/trusted/plugin/srpc_client.cc
index 9d57f6a..6ba8d57 100644
--- a/ppapi/native_client/src/trusted/plugin/srpc_client.cc
+++ b/ppapi/native_client/src/trusted/plugin/srpc_client.cc
@@ -97,6 +97,9 @@ void SrpcClient::GetMethods() {
                                                &name,
                                                &input_types,
                                                &output_types);
+    if (!retval) {
+      return;
+    }
     if (!IsValidIdentifierString(name, NULL)) {
       // If name is not an ECMAScript identifier, do not enter it into the
       // methods_ table.
diff --git a/ppapi/native_client/tests/ppapi_geturl/module.cc b/ppapi/native_client/tests/ppapi_geturl/module.cc
index 718c525..04dfef8 100644
--- a/ppapi/native_client/tests/ppapi_geturl/module.cc
+++ b/ppapi/native_client/tests/ppapi_geturl/module.cc
@@ -23,11 +23,6 @@
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 
-#if !defined(__native_client__)
-int32_t LoadUrl(PP_Instance /*instance*/, const char* /*url*/,
-                PP_CompletionCallback /*callback*/) { return PP_OK; }
-#endif
-
 namespace {
 
 // These constants need to match their corresponding JavaScript values in
@@ -84,14 +79,17 @@ PP_Bool Instance_DidCreate(PP_Instance pp_instance,
   PP_CompletionCallback html_cb =
       PP_MakeCompletionCallback(HTMLLoaded, url_count);
   int32_t result = LoadUrl(pp_instance, "ppapi_geturl_success.html", html_cb);
+  CHECK(PP_OK_COMPLETIONPENDING == result);
 
   PP_CompletionCallback robot_cb =
       PP_MakeCompletionCallback(RobotLoaded, url_count);
   result = LoadUrl(pp_instance, "http://www.google.com/robots.txt", robot_cb);
+  CHECK(PP_OK_COMPLETIONPENDING == result);
 
   PP_CompletionCallback non_exist_cb =
       PP_MakeCompletionCallback(NonExistLoaded, url_count);
   result = LoadUrl(pp_instance, "ppapi_nonexistent_url.html", non_exist_cb);
+  CHECK(PP_OK_COMPLETIONPENDING == result);
 
   return PP_TRUE;
 }