diff options
Diffstat (limited to 'www/chromium/files/patch-content_app_content__main__runner.cc')
| -rw-r--r-- | www/chromium/files/patch-content_app_content__main__runner.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc index d7a1b3e21e2a..b1d52e71dc4e 100644 --- a/www/chromium/files/patch-content_app_content__main__runner.cc +++ b/www/chromium/files/patch-content_app_content__main__runner.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner.cc.orig 2018-02-24 16:25:14.000000000 +0100 -+++ content/app/content_main_runner.cc 2018-03-03 23:04:17.370076000 +0100 -@@ -82,10 +82,10 @@ +--- content/app/content_main_runner.cc.orig 2018-06-13 00:10:16.000000000 +0200 ++++ content/app/content_main_runner.cc 2018-07-19 00:17:30.909304000 +0200 +@@ -84,10 +84,10 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -11,18 +11,18 @@ -#if !defined(OS_MACOSX) && !defined(OS_ANDROID) +#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) #include "content/zygote/zygote_main.h" + #include "sandbox/linux/services/libc_interceptor.h" #endif - -@@ -429,7 +429,7 @@ - } - - #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ -- !defined(OS_FUCHSIA) -+ !defined(OS_FUCHSIA) && !defined(OS_BSD) - // Zygote startup is special -- see RunZygote comments above - // for why we don't use ZygoteMain directly. - if (process_type == switches::kZygoteProcess) -@@ -499,10 +499,10 @@ +@@ -153,7 +153,7 @@ + namespace content { + extern int GpuMain(const content::MainFunctionParams&); + #if BUILDFLAG(ENABLE_PLUGINS) +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + extern int PluginMain(const content::MainFunctionParams&); + #endif + extern int PpapiPluginMain(const MainFunctionParams&); +@@ -702,10 +702,10 @@ kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID |