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

Unified Diff: remoting/host/host_plugin.cc

Issue 6976055: More POSIX support for Chromium, consisting mostly of broadening ifdefs. This (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/host_resolver_proc.cc ('k') | skia/ext/image_operations_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_plugin.cc
diff --git a/remoting/host/host_plugin.cc b/remoting/host/host_plugin.cc
index 11069d4d48756488666e439c7aea7738075c7fe1..bb6d4ac003e8015ba65f2dafadd4fd05046c2288 100644
--- a/remoting/host/host_plugin.cc
+++ b/remoting/host/host_plugin.cc
@@ -917,9 +917,9 @@ OSCALL NPError NP_GetEntryPoints(NPPluginFuncs* nppfuncs) {
}
OSCALL NPError NP_Initialize(NPNetscapeFuncs* npnetscape_funcs
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
, NPPluginFuncs* nppfuncs
-#endif // OS_LINUX
+#endif
) {
LOG(INFO) << "NP_Initialize";
if(npnetscape_funcs == NULL)
@@ -929,9 +929,9 @@ OSCALL NPError NP_Initialize(NPNetscapeFuncs* npnetscape_funcs
return NPERR_INCOMPATIBLE_VERSION_ERROR;
g_npnetscape_funcs = npnetscape_funcs;
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
NP_GetEntryPoints(nppfuncs);
-#endif // OS_LINUX
+#endif
return NPERR_NO_ERROR;
}
« no previous file with comments | « net/base/host_resolver_proc.cc ('k') | skia/ext/image_operations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698