bsds: views/ and webkit/ support for FreeBSD/OpenBSD

webkit/glue/plugins/plugin_lib.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/plugin_lib.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
@@ skipping 85 matching lines @@
   if (initialized_)
     return NPERR_NO_ERROR;
 
   if (!Load())
     return NPERR_MODULE_LOAD_FAILED_ERROR;
 
   PluginHost* host = PluginHost::Singleton();
   if (host == 0)
     return NPERR_GENERIC_ERROR;
 
-#if defined(OS_LINUX) || defined(OS_FREEBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   NPError rv = entry_points_.np_initialize(host->host_functions(),
                                            &plugin_funcs_);
 #else
   NPError rv = entry_points_.np_initialize(host->host_functions());
 #if defined(OS_MACOSX)
   // On the Mac, we need to get entry points after calling np_initialize to
   // match the behavior of other browsers.
   if (rv == NPERR_NO_ERROR) {
     rv = entry_points_.np_getentrypoints(&plugin_funcs_);
   }
@@ skipping 52 matching lines @@
       return rv;
 
     rv = true;  // assume success now
 
     entry_points_.np_initialize =
         (NP_InitializeFunc)base::GetFunctionPointerFromNativeLibrary(library,
             "NP_Initialize");
     if (entry_points_.np_initialize == 0)
       rv = false;
 
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
     entry_points_.np_getentrypoints =
         (NP_GetEntryPointsFunc)base::GetFunctionPointerFromNativeLibrary(
             library, "NP_GetEntryPoints");
     if (entry_points_.np_getentrypoints == 0)
       rv = false;
 #endif
 
     entry_points_.np_shutdown =
         (NP_ShutdownFunc)base::GetFunctionPointerFromNativeLibrary(library,
             "NP_Shutdown");
     if (entry_points_.np_shutdown == 0)
       rv = false;
   } else {
     rv = true;
   }
 
   if (rv) {
     plugin_funcs_.size = sizeof(plugin_funcs_);
     plugin_funcs_.version = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-#if !defined(OS_LINUX) && !defined(OS_FREEBSD) && !defined(OS_MACOSX)
+#if !defined(OS_POSIX)
     if (entry_points_.np_getentrypoints(&plugin_funcs_) != NPERR_NO_ERROR)
       rv = false;
 #else
     // On Linux and Mac, we get the plugin entry points during NP_Initialize.
 #endif
   }
 
   if (!internal_) {
     if (rv)
       library_ = library;
@@ skipping 61 matching lines @@
 }
 
 void PluginLib::Shutdown() {
   if (initialized_ && !internal_) {
     NP_Shutdown();
     initialized_ = false;
   }
 }
 
 }  // namespace NPAPI