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

Unified Diff: lib/Support/LockFileManager.cpp

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: undo localmod Created 5 years, 10 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
« no previous file with comments | « lib/Support/CrashRecoveryContext.cpp ('k') | lib/Support/MemoryBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/Support/LockFileManager.cpp
diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp
index 5b82c367c0ad1253ea26bad0574cdd24ac146f58..a258893715e890073a9d643141335a67df3e4a32 100644
--- a/lib/Support/LockFileManager.cpp
+++ b/lib/Support/LockFileManager.cpp
@@ -24,6 +24,10 @@
#endif
using namespace llvm;
+// @LOCALMOD-BEGIN
+#if !defined(PNACL_BROWSER_TRANSLATOR)
+// @LOCALMOD-END
+
/// \brief Attempt to read the lock file with the given name, if it exists.
///
/// \param LockFileName The name of the lock file to read.
@@ -58,7 +62,9 @@ LockFileManager::readLockFile(StringRef LockFileName) {
}
bool LockFileManager::processStillExecuting(StringRef Hostname, int PID) {
-#if LLVM_ON_UNIX && !defined(__ANDROID__)
+// @LOCALMOD-BEGIN
+#if LLVM_ON_UNIX && !defined(__ANDROID__) && !defined(__native_client__)
+// @LOCALMOD-END
char MyHostname[256];
MyHostname[255] = 0;
MyHostname[0] = 0;
@@ -263,3 +269,5 @@ LockFileManager::WaitForUnlockResult LockFileManager::waitForUnlock() {
// Give up.
return Res_Timeout;
}
+
+#endif // __native_client__ @LOCALMOD
« no previous file with comments | « lib/Support/CrashRecoveryContext.cpp ('k') | lib/Support/MemoryBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698