diff options
Diffstat (limited to 'www/iridium/files/patch-mojo_public_c_system_thunks.cc')
| -rw-r--r-- | www/iridium/files/patch-mojo_public_c_system_thunks.cc | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/www/iridium/files/patch-mojo_public_c_system_thunks.cc b/www/iridium/files/patch-mojo_public_c_system_thunks.cc index ca948070d23d..826608045fde 100644 --- a/www/iridium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/iridium/files/patch-mojo_public_c_system_thunks.cc @@ -1,29 +1,47 @@ ---- mojo/public/c/system/thunks.cc.orig 2019-01-09 11:00:07.794493000 +0100 -+++ mojo/public/c/system/thunks.cc 2019-01-09 11:03:08.369317000 +0100 -@@ -14,7 +14,7 @@ +--- mojo/public/c/system/thunks.cc.orig 2019-03-11 22:01:00 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) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#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" -@@ -38,7 +38,7 @@ - typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks); +@@ -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 +@@ -65,7 +65,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) && +@@ -84,7 +84,7 @@ class CoreLibraryInitializer { - 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) - auto environment = base::Environment::Create(); - - base::FilePath library_path; -@@ -80,7 +80,7 @@ + const base::FilePath::CharType kDefaultLibraryPathValue[] = + FILE_PATH_LITERAL("./libmojo_core.so"); + #elif defined(OS_WIN) +@@ -147,7 +147,7 @@ class CoreLibraryInitializer { ~CoreLibraryInitializer() = default; private: --#if defined(OS_CHROMEOS) || defined(OS_LINUX) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) +-#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 |