mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
217593e8de
Note that this is still a beta version, and that the sysctl kern.ipc.shm_allow_removed must be set to 1 for correct operation. Port changes: - add dependency on accessibility/speech-dispatcher for libspeechd - use internal libvpx - update disk space requirements - add pkg-message for the above sysctl Submitted by: George Liaskos Security: http://vuxml.org/freebsd/bdd48858-9656-11e2-a9a8-00262d5ed8ee.html
53 lines
2 KiB
C++
53 lines
2 KiB
C++
--- chrome/browser/process_singleton.h.orig 2013-02-28 10:15:23.000000000 +0200
|
|
+++ chrome/browser/process_singleton.h 2013-03-06 20:43:40.000000000 +0200
|
|
@@ -24,9 +24,9 @@
|
|
#include "base/threading/non_thread_safe.h"
|
|
#include "ui/gfx/native_widget_types.h"
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
#include "base/files/scoped_temp_dir.h"
|
|
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
|
|
class CommandLine;
|
|
|
|
@@ -114,9 +114,9 @@
|
|
LRESULT WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
|
|
#endif
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
static void DisablePromptForTesting();
|
|
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
|
|
protected:
|
|
// Notify another process, if available.
|
|
@@ -125,7 +125,7 @@
|
|
// On Windows, Create() has to be called before this.
|
|
NotifyResult NotifyOtherProcess();
|
|
|
|
-#if defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
// Exposed for testing. We use a timeout on Linux, and in tests we want
|
|
// this timeout to be short.
|
|
NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
|
|
@@ -138,7 +138,7 @@
|
|
void OverrideCurrentPidForTesting(base::ProcessId pid);
|
|
void OverrideKillCallbackForTesting(
|
|
const base::Callback<void(int)>& callback);
|
|
-#endif // defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#endif // defined(OS_LINUX) || defined(OS_BSD)
|
|
|
|
private:
|
|
typedef std::pair<CommandLine::StringVector,
|
|
@@ -165,7 +165,7 @@
|
|
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
|
|
HANDLE lock_file_;
|
|
base::FilePath user_data_dir_;
|
|
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
|
// Return true if the given pid is one of our child processes.
|
|
// Assumes that the current pid is the root of all pids of the current
|
|
// instance.
|