Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1201)

Side by Side Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.c

Issue 322443007: NaCl: Fix irt_shim_ppapi.c to compile with -Wstrict-prototypes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 The Chromium Authors. All rights reserved. 2 * Copyright 2014 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h" 7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/irt_shim_ppapi.h"
8 8
9 #include "native_client/src/untrusted/irt/irt.h" 9 #include "native_client/src/untrusted/irt/irt.h"
10 #include "ppapi/nacl_irt/public/irt_ppapi.h" 10 #include "ppapi/nacl_irt/public/irt_ppapi.h"
(...skipping 15 matching lines...) Expand all
26 26
27 static int32_t shim_PPPInitializeModule(PP_Module module_id, 27 static int32_t shim_PPPInitializeModule(PP_Module module_id,
28 PPB_GetInterface get_browser_intf) { 28 PPB_GetInterface get_browser_intf) {
29 /* Record the original PPB_GetInterface and provide a shimmed one. */ 29 /* Record the original PPB_GetInterface and provide a shimmed one. */
30 __set_real_Pnacl_PPBGetInterface(get_browser_intf); 30 __set_real_Pnacl_PPBGetInterface(get_browser_intf);
31 return (*g_user_start_functions.PPP_InitializeModule)( 31 return (*g_user_start_functions.PPP_InitializeModule)(
32 module_id, 32 module_id,
33 &__Pnacl_PPBGetInterface); 33 &__Pnacl_PPBGetInterface);
34 } 34 }
35 35
36 static void shim_PPPShutdownModule() { 36 static void shim_PPPShutdownModule(void) {
37 (*g_user_start_functions.PPP_ShutdownModule)(); 37 (*g_user_start_functions.PPP_ShutdownModule)();
38 } 38 }
39 39
40 #ifdef PNACL_SHIM_AOT 40 #ifdef PNACL_SHIM_AOT
41 /* 41 /*
42 * This will be discovered and set by the shim, since we cannot link 42 * This will be discovered and set by the shim, since we cannot link
43 * against the IRT directly in the AOT library. 43 * against the IRT directly in the AOT library.
44 */ 44 */
45 int (*real_irt_ppapi_start)(const struct PP_StartFunctions *) = NULL; 45 int (*real_irt_ppapi_start)(const struct PP_StartFunctions *) = NULL;
46 #else 46 #else
(...skipping 23 matching lines...) Expand all
70 */ 70 */
71 return (*real_irt_ppapi_start)(&wrapped_ppapi_methods); 71 return (*real_irt_ppapi_start)(&wrapped_ppapi_methods);
72 } 72 }
73 73
74 #ifndef PNACL_SHIM_AOT 74 #ifndef PNACL_SHIM_AOT
75 const struct nacl_irt_ppapihook nacl_irt_ppapihook_pnacl_private = { 75 const struct nacl_irt_ppapihook nacl_irt_ppapihook_pnacl_private = {
76 irt_shim_ppapi_start, 76 irt_shim_ppapi_start,
77 PpapiPluginRegisterThreadCreator, 77 PpapiPluginRegisterThreadCreator,
78 }; 78 };
79 #endif 79 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698