Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(722)

Unified Diff: ipc/ipc_channel_posix.h

Issue 659243002: Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ipc/ipc_channel_posix.h
diff --git a/ipc/ipc_channel_posix.h b/ipc/ipc_channel_posix.h
index c6da141d975c553d500e1786846d1b07f6d8ea72..8b769d159cce9237550f4da58b2f9af77abfc118 100644
--- a/ipc/ipc_channel_posix.h
+++ b/ipc/ipc_channel_posix.h
@@ -85,9 +85,9 @@ class IPC_EXPORT ChannelPosix : public Channel,
void CloseClientFileDescriptor();
static bool IsNamedServerInitialized(const std::string& channel_id);
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(__native_client_nonsfi__)
static void SetGlobalPid(int pid);
-#endif // OS_LINUX
+#endif
private:
bool CreatePipe(const IPC::ChannelHandle& channel_handle);
@@ -214,10 +214,10 @@ class IPC_EXPORT ChannelPosix : public Channel,
// True if we are responsible for unlinking the unix domain socket file.
bool must_unlink_;
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(__native_client_nonsfi__)
// If non-zero, overrides the process ID sent in the hello message.
static int global_pid_;
-#endif // OS_LINUX
+#endif
DISALLOW_IMPLICIT_CONSTRUCTORS(ChannelPosix);
};

Powered by Google App Engine
This is Rietveld 408576698