diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-01 17:38:47 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | a873c8ac8e3c7252f191b1774a9137a91b8ae80d (patch) | |
| tree | aad7746cf06a6eb97b36b7c8209c0386c68d2c72 /base | |
| parent | 10a271fde41d76b98e66b4394f9bee383be5a1da (diff) | |
| download | external_chromium-a873c8ac8e3c7252f191b1774a9137a91b8ae80d.zip external_chromium-a873c8ac8e3c7252f191b1774a9137a91b8ae80d.tar.gz external_chromium-a873c8ac8e3c7252f191b1774a9137a91b8ae80d.tar.bz2 | |
Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc
Changes around local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/base/shared_memory_posix.cc?view=diff&r1=70974&r2=70975
Change-Id: I3c06547ed799c4b1048163cb98b0c0da05ad7cf6
Diffstat (limited to 'base')
| -rw-r--r-- | base/shared_memory_posix.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc index 5ac7597..4793627 100644 --- a/base/shared_memory_posix.cc +++ b/base/shared_memory_posix.cc @@ -235,11 +235,15 @@ void SharedMemory::Close() { } void SharedMemory::Lock() { +#if !defined(ANDROID) LockOrUnlockCommon(F_LOCK); +#endif } void SharedMemory::Unlock() { +#if !defined(ANDROID) LockOrUnlockCommon(F_ULOCK); +#endif } bool SharedMemory::PrepareMapFile(FILE *fp) { @@ -310,19 +314,6 @@ void SharedMemory::LockOrUnlockCommon(int function) { #endif } -<<<<<<< HEAD -void SharedMemory::Lock() { -#if !defined(ANDROID) - LockOrUnlockCommon(F_LOCK); -#endif -} - -void SharedMemory::Unlock() { -#if !defined(ANDROID) - LockOrUnlockCommon(F_ULOCK); -#endif -} -======= bool SharedMemory::ShareToProcessCommon(ProcessHandle process, SharedMemoryHandle *new_handle, bool close_self) { @@ -333,7 +324,6 @@ bool SharedMemory::ShareToProcessCommon(ProcessHandle process, if (close_self) Close(); ->>>>>>> chromium.org at r11.0.672.0 return true; } |