summaryrefslogtreecommitdiffstats
path: root/base/shared_memory.h
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 20:04:11 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-16 20:04:11 +0000
commitd600ce473711c57bd6ec4102f9f0f3628343aa2a (patch)
treeeb23f25692b19f50941abecd0f31b11b6d3d37ba /base/shared_memory.h
parentd1e5cda8b4e31035e425d6f0eed430e3baf57352 (diff)
downloadchromium_src-d600ce473711c57bd6ec4102f9f0f3628343aa2a.zip
chromium_src-d600ce473711c57bd6ec4102f9f0f3628343aa2a.tar.gz
chromium_src-d600ce473711c57bd6ec4102f9f0f3628343aa2a.tar.bz2
Implement SharedMemory for untrusted NaCl builds.
BUG=116317 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10702197 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/shared_memory.h')
-rw-r--r--base/shared_memory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/shared_memory.h b/base/shared_memory.h
index 6d68fe3..e1c0833 100644
--- a/base/shared_memory.h
+++ b/base/shared_memory.h
@@ -169,7 +169,7 @@ class BASE_EXPORT SharedMemory {
// identifier is not portable.
SharedMemoryHandle handle() const;
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_NACL)
// Returns a unique identifier for this shared memory segment. Inode numbers
// are technically only unique to a single filesystem. However, we always
// allocate shared memory backing files from the same directory, so will end
@@ -223,7 +223,7 @@ class BASE_EXPORT SharedMemory {
void Unlock();
private:
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_NACL)
bool PrepareMapFile(FILE *fp);
bool FilePathForMemoryName(const std::string& mem_name, FilePath* path);
void LockOrUnlockCommon(int function);