summaryrefslogtreecommitdiffstats
path: root/base/process_util.h
diff options
context:
space:
mode:
authorstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 20:03:01 +0000
committerstuartmorgan@google.com <stuartmorgan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 20:03:01 +0000
commit2aea9e09fb8fef9b318d04e241726651c9e87b31 (patch)
tree32e7664ec7af10d0c48197e9608f1913e38479f4 /base/process_util.h
parentc9df809a7979d30bd42c3015fd21fedfecbdf1a6 (diff)
downloadchromium_src-2aea9e09fb8fef9b318d04e241726651c9e87b31.zip
chromium_src-2aea9e09fb8fef9b318d04e241726651c9e87b31.tar.gz
chromium_src-2aea9e09fb8fef9b318d04e241726651c9e87b31.tar.bz2
Remove the Mac-specific implementation of LaunchApp, and share the Linux version.
Fixes a race condition with file descriptors, and gives the Mac access to the environment-alterning version of LaunchApp BUG=11174 TEST=Launching render/plugin/utility processes should still work on the Mac Review URL: http://codereview.chromium.org/165067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
-rw-r--r--base/process_util.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/process_util.h b/base/process_util.h
index 31d8de7..450dbc2 100644
--- a/base/process_util.h
+++ b/base/process_util.h
@@ -142,7 +142,7 @@ typedef std::vector<std::pair<int, int> > file_handle_mapping_vector;
bool LaunchApp(const std::vector<std::string>& argv,
const file_handle_mapping_vector& fds_to_remap,
bool wait, ProcessHandle* process_handle);
-#if defined(OS_LINUX)
+
// Similar to above, but also (un)set environment variables in child process
// through |environ|.
typedef std::vector<std::pair<const char*, const char*> > environment_vector;
@@ -150,7 +150,6 @@ bool LaunchApp(const std::vector<std::string>& argv,
const environment_vector& environ,
const file_handle_mapping_vector& fds_to_remap,
bool wait, ProcessHandle* process_handle);
-#endif // defined(OS_LINUX)
#endif // defined(OS_POSIX)
// Executes the application specified by cl. This function delegates to one