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.cc18
1 files changed, 5 insertions, 13 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 95fd459e0170..799396b668ec 100644
--- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,6 +1,6 @@
---- mojo/public/c/system/thunks.cc.orig 2021-07-19 18:45:18 UTC
+--- mojo/public/c/system/thunks.cc.orig 2022-02-07 13:39:41 UTC
+++ mojo/public/c/system/thunks.cc
-@@ -20,7 +20,7 @@
+@@ -19,7 +19,7 @@
#include "mojo/public/c/system/core.h"
#include "mojo/public/c/system/macros.h"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/scoped_native_library.h"
-@@ -68,7 +68,7 @@ class CoreLibraryInitializer {
+@@ -67,7 +67,7 @@ class CoreLibraryInitializer {
~CoreLibraryInitializer() = default;
MojoResult LoadLibrary(base::FilePath library_path) {
@@ -18,7 +18,7 @@
if (library_ && library_->is_valid())
return MOJO_RESULT_OK;
-@@ -82,7 +82,7 @@ class CoreLibraryInitializer {
+@@ -81,7 +81,7 @@ class CoreLibraryInitializer {
if (library_path.empty()) {
// Default to looking for the library in the current working directory.
@@ -27,15 +27,7 @@
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)
+@@ -131,7 +131,7 @@ class CoreLibraryInitializer {
}
private: