mirror of
https://git.freebsd.org/ports.git
synced 2025-07-03 02:20:33 -04:00
90ee19fc94
- Limit to python 2.X [2] - Convert to USES=gmake - Drop dependency on libspeechd, enable webrtc [3] - Use GCC 4.6+ again [4] Submitted by: George Liaskos [1,3] eadler [2] Discussed with: George Liaskos [4] Security: http://vuxml.org/freebsd/3b80104f-e96c-11e2-8bac-00262d5ed8ee.html [1]
35 lines
1.4 KiB
C++
35 lines
1.4 KiB
C++
--- content/app/content_main_runner.cc.orig 2013-07-15 19:05:22.000000000 +0300
|
|
+++ content/app/content_main_runner.cc 2013-07-15 19:11:30.000000000 +0300
|
|
@@ -78,10 +78,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
|
|
|
|
@@ -323,7 +323,8 @@
|
|
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().
|
|
@@ -432,7 +433,8 @@
|
|
}
|
|
}
|
|
|
|
-#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)
|