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 | 42 |
1 files changed, 42 insertions, 0 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 new file mode 100644 index 000000000000..c197a2277562 --- /dev/null +++ b/www/chromium/files/patch-content_app_content__main__runner.cc @@ -0,0 +1,42 @@ +--- content/app/content_main_runner.cc.orig 2016-05-11 19:02:20 UTC ++++ content/app/content_main_runner.cc +@@ -98,10 +98,10 @@ + #include "base/posix/global_descriptors.h" + #include "content/public/common/content_descriptors.h" + +-#if !defined(OS_MACOSX) ++#if !defined(OS_MACOSX) && !defined(OS_BSD) + #include "content/public/common/zygote_fork_delegate_linux.h" + #endif +-#if !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + #include "content/zygote/zygote_main.h" + #endif + +@@ -273,7 +273,7 @@ struct MainFunction { + int (*function)(const MainFunctionParams&); + }; + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // On platforms that use the zygote, we have a special subset of + // subprocesses that are launched via the zygote. This function + // fills in some process-launching bits around ZygoteMain(). +@@ -322,7 +322,7 @@ int RunZygote(const MainFunctionParams& + NOTREACHED() << "Unknown zygote process type: " << process_type; + return 1; + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + + #if !defined(OS_IOS) + static void RegisterMainThreadFactories() { +@@ -396,7 +396,7 @@ int RunNamedProcessTypeMain( + } + } + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) + // Zygote startup is special -- see RunZygote comments above + // for why we don't use ZygoteMain directly. + if (process_type == switches::kZygoteProcess) |