diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:41:43 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:41:43 +0000 |
| commit | a0607da9446e3ec76a7ced32502f8c7e71654d53 (patch) | |
| tree | 958a5b77aa00de5981641531e683b565c6d5b3cf /base/file_descriptor_shuffle.h | |
| parent | 651b77c761749949fc7f148e3c20fe203a61bf7d (diff) | |
| download | chromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.zip chromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.tar.gz chromium_src-a0607da9446e3ec76a7ced32502f8c7e71654d53.tar.bz2 | |
Revert "POSIX: don't allocate memory after forking."
Appears to break tlslite on the Mac.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_descriptor_shuffle.h')
| -rw-r--r-- | base/file_descriptor_shuffle.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/base/file_descriptor_shuffle.h b/base/file_descriptor_shuffle.h index e1c93cd..e0cb88b 100644 --- a/base/file_descriptor_shuffle.h +++ b/base/file_descriptor_shuffle.h @@ -69,13 +69,9 @@ typedef std::vector<InjectionArc> InjectiveMultimap; bool PerformInjectiveMultimap(const InjectiveMultimap& map, InjectionDelegate* delegate); -bool PerformInjectiveMultimapDestructive(InjectiveMultimap* map, - InjectionDelegate* delegate); - -// This function will not call malloc but will mutate |map| -static inline bool ShuffleFileDescriptors(InjectiveMultimap* map) { +static inline bool ShuffleFileDescriptors(const InjectiveMultimap& map) { FileDescriptorTableInjection delegate; - return PerformInjectiveMultimapDestructive(map, &delegate); + return PerformInjectiveMultimap(map, &delegate); } } // namespace base |