aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-mojo_public_c_system_thunks.cc
diff options
context:
space:
mode:
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.cc48
1 files changed, 20 insertions, 28 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 354cd1873335..fc8468610cda 100644
--- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,46 +1,38 @@
---- mojo/public/c/system/thunks.cc.orig 2021-04-14 18:41:06 UTC
+--- mojo/public/c/system/thunks.cc.orig 2024-03-22 08:19:40 UTC
+++ mojo/public/c/system/thunks.cc
-@@ -20,7 +20,7 @@
- #include "mojo/public/c/system/core.h"
- #include "mojo/public/c/system/macros.h"
+@@ -25,7 +25,7 @@
+ #include "mojo/public/c/system/message_pipe.h"
--#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_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/optional.h"
-@@ -68,7 +68,7 @@ class CoreLibraryInitializer {
- ~CoreLibraryInitializer() = default;
+ #include "base/scoped_native_library.h"
+@@ -72,7 +72,7 @@ class CoreLibraryInitializer {
MojoResult LoadLibrary(base::FilePath library_path) {
--#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_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;
-@@ -82,7 +82,7 @@ class CoreLibraryInitializer {
+@@ -86,7 +86,7 @@ class CoreLibraryInitializer {
if (library_path.empty()) {
// 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)
+-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
- #elif defined(OS_WIN)
-@@ -126,13 +126,13 @@ class CoreLibraryInitializer {
-
- library_ = std::move(library);
- return MOJO_RESULT_OK;
--#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-+#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- return MOJO_RESULT_UNIMPLEMENTED;
--#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
-+#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
- }
+ #elif BUILDFLAG(IS_FUCHSIA)
+@@ -142,7 +142,7 @@ class CoreLibraryInitializer {
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_;
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ std::optional<base::ScopedNativeLibrary> library_;
#endif
};