| Index: ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
|
| diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
|
| index 7ef24ca03c40c53a17cd841beb79121f6cb1dbcb..dfaebe62f41b1c2fcdd6ca95799f4c8d34f3d439 100644
|
| --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
|
| +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_gamepad_rpc_server.cc
|
| @@ -6,13 +6,13 @@
|
|
|
| #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
|
| #include "native_client/src/shared/ppapi_proxy/utility.h"
|
| -#include "ppapi/c/dev/ppb_gamepad_dev.h"
|
| +#include "ppapi/c/ppb_gamepad.h"
|
| #include "srpcgen/ppb_rpc.h"
|
|
|
| using ppapi_proxy::DebugPrintf;
|
| using ppapi_proxy::PPBGamepadInterface;
|
|
|
| -void PpbGamepadRpcServer::PPB_Gamepad_SampleGamepads(
|
| +void PpbGamepadRpcServer::PPB_Gamepad_Sample(
|
| NaClSrpcRpc* rpc,
|
| NaClSrpcClosure* done,
|
| // inputs
|
| @@ -21,12 +21,12 @@ void PpbGamepadRpcServer::PPB_Gamepad_SampleGamepads(
|
| nacl_abi_size_t* pads_bytes, char* pads) {
|
| NaClSrpcClosureRunner runner(done);
|
| rpc->result = NACL_SRPC_RESULT_APP_ERROR;
|
| - if (*pads_bytes != sizeof(struct PP_GamepadsSampleData_Dev))
|
| + if (*pads_bytes != sizeof(struct PP_GamepadsSampleData))
|
| return;
|
|
|
| PPBGamepadInterface()->Sample(
|
| instance,
|
| - reinterpret_cast<struct PP_GamepadsSampleData_Dev*>(pads));
|
| + reinterpret_cast<struct PP_GamepadsSampleData*>(pads));
|
| DebugPrintf("PPB_Gamepad::SampleGamepads\n");
|
|
|
| rpc->result = NACL_SRPC_RESULT_OK;
|
|
|