summaryrefslogtreecommitdiff
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.cc12
1 files changed, 6 insertions, 6 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 7b80d534819e..826608045fde 100644
--- a/www/chromium/files/patch-mojo_public_c_system_thunks.cc
+++ b/www/chromium/files/patch-mojo_public_c_system_thunks.cc
@@ -1,5 +1,5 @@
---- mojo/public/c/system/thunks.cc.orig 2019-01-08 19:19:50.188491000 +0100
-+++ mojo/public/c/system/thunks.cc 2019-01-08 19:21:20.891924000 +0100
+--- 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"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/optional.h"
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ namespace {
typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks);
@@ -18,7 +18,7 @@
PROTECTED_MEMORY_SECTION
base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks;
#endif
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@ namespace mojo {
class CoreLibraryInitializer {
public:
CoreLibraryInitializer(const MojoInitializeOptions* options) {
@@ -27,7 +27,7 @@
bool application_provided_path = false;
base::Optional<base::FilePath> library_path;
if (options && options->struct_size >= sizeof(*options) &&
-@@ -82,7 +82,7 @@
+@@ -84,7 +84,7 @@ class CoreLibraryInitializer {
if (!library_path) {
// Default to looking for the library in the current working directory.
@@ -36,7 +36,7 @@
const base::FilePath::CharType kDefaultLibraryPathValue[] =
FILE_PATH_LITERAL("./libmojo_core.so");
#elif defined(OS_WIN)
-@@ -132,7 +132,7 @@
+@@ -147,7 +147,7 @@ class CoreLibraryInitializer {
~CoreLibraryInitializer() = default;
private: