diff options
Diffstat (limited to 'www/chromium/files/patch-mojo_public_c_system_thunks.cc')
-rw-r--r-- | www/chromium/files/patch-mojo_public_c_system_thunks.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/www/chromium/files/patch-mojo_public_c_system_thunks.cc b/www/chromium/files/patch-mojo_public_c_system_thunks.cc index 6ac3766ca400..fe26aa1cf5a8 100644 --- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc @@ -1,24 +1,24 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-02-28 16:54:41 UTC +--- mojo/public/c/system/thunks.cc.orig 2022-03-25 21:59:56 UTC +++ mojo/public/c/system/thunks.cc -@@ -19,7 +19,7 @@ - #include "mojo/public/c/system/core.h" +@@ -20,7 +20,7 @@ #include "mojo/public/c/system/macros.h" --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -67,7 +67,7 @@ class CoreLibraryInitializer { - ~CoreLibraryInitializer() = default; +@@ -69,7 +69,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -81,7 +81,7 @@ class CoreLibraryInitializer { +@@ -83,7 +83,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -26,13 +26,13 @@ +#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); - #elif BUILDFLAG(IS_WIN) -@@ -131,7 +131,7 @@ class CoreLibraryInitializer { - } + #elif BUILDFLAG(IS_FUCHSIA) +@@ -139,7 +139,7 @@ class CoreLibraryInitializer { private: --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) absl::optional<base::ScopedNativeLibrary> library_; #endif }; |