summaryrefslogtreecommitdiffstats
path: root/webkit/tools/pepper_test_plugin/main.cc
diff options
context:
space:
mode:
authorpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 04:08:14 +0000
committerpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-30 04:08:14 +0000
commitf5d01f28f7303a06df34324e0549e6d591c5088e (patch)
treefb54447770d34686b2c26e4575a1f952463c7b87 /webkit/tools/pepper_test_plugin/main.cc
parentde61d5f521eb7489a6ec82048fc63f51ef98ece6 (diff)
downloadchromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.zip
chromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.tar.gz
chromium_src-f5d01f28f7303a06df34324e0549e6d591c5088e.tar.bz2
webkit/ ifdefs for BSD port; based on sprewell@jaggeri.com patch
Review URL: http://codereview.chromium.org/1483001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43053 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/pepper_test_plugin/main.cc')
-rw-r--r--webkit/tools/pepper_test_plugin/main.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/pepper_test_plugin/main.cc b/webkit/tools/pepper_test_plugin/main.cc
index 1ecd8c6..061b54b 100644
--- a/webkit/tools/pepper_test_plugin/main.cc
+++ b/webkit/tools/pepper_test_plugin/main.cc
@@ -113,7 +113,7 @@ void Log(NPP instance, const char* format, ...) {
extern "C" {
EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
, NPPluginFuncs* plugin_funcs
#endif
);
@@ -125,7 +125,7 @@ EXPORT void API_CALL NP_Shutdown() {
#endif
}
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
EXPORT NPError API_CALL NP_GetValue(NPP instance,
NPPVariable variable,
void* value);
@@ -136,7 +136,7 @@ EXPORT const char* API_CALL NP_GetMIMEDescription();
// Plugin entry points
EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
, NPPluginFuncs* plugin_funcs
#endif
) {
@@ -144,7 +144,7 @@ EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
#if !defined(INDEPENDENT_PLUGIN)
pglInitialize();
#endif
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
return NP_GetEntryPoints(plugin_funcs);
#else
return NPERR_NO_ERROR;
@@ -250,7 +250,7 @@ NPError NPP_GetValue(NPP instance, NPPVariable variable, void* value) {
NPError err = NPERR_NO_ERROR;
switch (variable) {
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
case NPPVpluginNameString:
*((const char**)value) = "Pepper Test PlugIn";
break;
@@ -282,7 +282,7 @@ NPError NPP_SetValue(NPP instance, NPNVariable variable, void* value) {
return NPERR_GENERIC_ERROR;
}
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable, void* value) {
return NPP_GetValue(instance, variable, value);
}