diff options
author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-09 17:33:10 +0000 |
---|---|---|
committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-09 17:33:10 +0000 |
commit | c64b8c1fd140d1d914f0bda10a7a414fa9c08916 (patch) | |
tree | 09264a66169a27d9075184d44457e3427a6bbffc /webkit/default_plugin | |
parent | f4fbe5b7f5b9a19310aeeb164f2cc92d6690d916 (diff) | |
download | chromium_src-c64b8c1fd140d1d914f0bda10a7a414fa9c08916.zip chromium_src-c64b8c1fd140d1d914f0bda10a7a414fa9c08916.tar.gz chromium_src-c64b8c1fd140d1d914f0bda10a7a414fa9c08916.tar.bz2 |
Replace "WINAPI" with platform-independent "API_CALL".
Review URL: http://codereview.chromium.org/1662
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin')
-rw-r--r-- | webkit/default_plugin/default_plugin.cc | 7 | ||||
-rw-r--r-- | webkit/default_plugin/plugin_main.cc | 7 | ||||
-rw-r--r-- | webkit/default_plugin/plugin_main.h | 7 |
3 files changed, 9 insertions, 12 deletions
diff --git a/webkit/default_plugin/default_plugin.cc b/webkit/default_plugin/default_plugin.cc index 3a118d3..0415c8a 100644 --- a/webkit/default_plugin/default_plugin.cc +++ b/webkit/default_plugin/default_plugin.cc @@ -6,16 +6,15 @@ #include "webkit/default_plugin/plugin_main.h" extern "C" { -NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs) { +NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) { return default_plugin::NP_GetEntryPoints(funcs); } -NPError WINAPI NP_Initialize(NPNetscapeFuncs* funcs) { +NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs) { return default_plugin::NP_Initialize(funcs); } -NPError WINAPI NP_Shutdown() { +NPError API_CALL NP_Shutdown() { return default_plugin::NP_Shutdown(); } } // extern "C" - diff --git a/webkit/default_plugin/plugin_main.cc b/webkit/default_plugin/plugin_main.cc index 2a06da2..f23a6f8 100644 --- a/webkit/default_plugin/plugin_main.cc +++ b/webkit/default_plugin/plugin_main.cc @@ -24,7 +24,7 @@ inline HMODULE GetCurrentModuleHandle() { // Initialized in NP_Initialize. NPNetscapeFuncs* g_browser = NULL; -NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs) { +NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs) { funcs->version = 11; funcs->size = sizeof(*funcs); funcs->newp = NPP_New; @@ -43,13 +43,13 @@ NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs) { return NPERR_NO_ERROR; } -NPError WINAPI NP_Initialize(NPNetscapeFuncs* funcs) { +NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs) { g_browser = funcs; activex_shim::g_browser = funcs; return 0; } -NPError WINAPI NP_Shutdown(void) { +NPError API_CALL NP_Shutdown(void) { g_browser = NULL; return 0; } @@ -210,4 +210,3 @@ int16 NPP_HandleEvent(NPP instance, void* event) { } } // default_plugin - diff --git a/webkit/default_plugin/plugin_main.h b/webkit/default_plugin/plugin_main.h index 6de4f84..532d4cb 100644 --- a/webkit/default_plugin/plugin_main.h +++ b/webkit/default_plugin/plugin_main.h @@ -27,9 +27,8 @@ void NPP_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData); int16 NPP_HandleEvent(NPP instance, void* event); -NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* funcs); -NPError WINAPI NP_Initialize(NPNetscapeFuncs* funcs); -NPError WINAPI NP_Shutdown(void); +NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* funcs); +NPError API_CALL NP_Initialize(NPNetscapeFuncs* funcs); +NPError API_CALL NP_Shutdown(void); } // default_plugin - |