diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 00:11:25 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-24 00:11:25 +0000 |
| commit | e614262b18654a1a62da00d5a8e4d3de3eda9f81 (patch) | |
| tree | d14dfebe8119c53887b8477422f070a297db9185 /webkit/glue/plugins/test/npapi_test.cc | |
| parent | f9d44aa6e5fdefae83b3e02effdd7376b31dd3ef (diff) | |
| download | chromium_src-e614262b18654a1a62da00d5a8e4d3de3eda9f81.zip chromium_src-e614262b18654a1a62da00d5a8e4d3de3eda9f81.tar.gz chromium_src-e614262b18654a1a62da00d5a8e4d3de3eda9f81.tar.bz2 | |
port some parts of webkit/glue/plugins/test to Linux
these are not all parts (about a half), but still something
BUG=1949
Patch from Paweł Hajdan jr <phajdan.jr@gmail.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/test/npapi_test.cc')
| -rw-r--r-- | webkit/glue/plugins/test/npapi_test.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/webkit/glue/plugins/test/npapi_test.cc b/webkit/glue/plugins/test/npapi_test.cc index e12a7da..a286e58 100644 --- a/webkit/glue/plugins/test/npapi_test.cc +++ b/webkit/glue/plugins/test/npapi_test.cc @@ -41,23 +41,30 @@ // // +#include "base/basictypes.h" + +#if defined(OS_WIN) #include <windows.h> +#endif + #include "webkit/glue/plugins/test/plugin_client.h" -BOOL WINAPI DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) { +#if defined(OS_WIN) +BOOL API_CALL DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) { return TRUE; } +#endif extern "C" { -NPError WINAPI NP_GetEntryPoints(NPPluginFuncs* pFuncs) { +NPError API_CALL NP_GetEntryPoints(NPPluginFuncs* pFuncs) { return NPAPIClient::PluginClient::GetEntryPoints(pFuncs); } -NPError WINAPI NP_Initialize(NPNetscapeFuncs* pFuncs) { +NPError API_CALL NP_Initialize(NPNetscapeFuncs* pFuncs) { return NPAPIClient::PluginClient::Initialize(pFuncs); } -NPError WINAPI NP_Shutdown() { +NPError API_CALL NP_Shutdown() { return NPAPIClient::PluginClient::Shutdown(); } } // extern "C" |