blob: 18e6e1243369984cb8d5a3fad8a3b0a970c4a411 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- mojo/public/c/system/thunks.cc.orig 2019-03-15 06:37:28 UTC
+++ mojo/public/c/system/thunks.cc
@@ -16,7 +16,7 @@
#include "build/build_config.h"
#include "mojo/public/c/system/core.h"
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/optional.h"
@@ -28,7 +28,7 @@ namespace {
typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks);
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
PROTECTED_MEMORY_SECTION
base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks;
#endif
@@ -63,7 +63,7 @@ namespace mojo {
class CoreLibraryInitializer {
public:
CoreLibraryInitializer(const MojoInitializeOptions* options) {
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
bool application_provided_path = false;
base::Optional<base::FilePath> library_path;
if (options && options->struct_size >= sizeof(*options) &&
@@ -82,7 +82,7 @@ class CoreLibraryInitializer {
if (!library_path) {
// Default to looking for the library in the current working directory.
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
#elif defined(OS_WIN)
@@ -132,7 +132,7 @@ class CoreLibraryInitializer {
~CoreLibraryInitializer() = default;
private:
-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
base::Optional<base::ScopedNativeLibrary> library_;
#endif
|
