diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-09-18 15:07:33 -0700 |
| commit | ef9bd62c68c2c279926e66058bc5a6ef62150432 (patch) | |
| tree | 247f92a4e885f15dbcd37685fa9dbaa7c1db7c67 /lib/Support/LockFileManager.cpp | |
| parent | 5868d5c7576d519a0bba685e7a0471ee306f5eee (diff) | |
| parent | 8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f (diff) | |
Merge commit '8e70b5506ec0d7a6c2740bc89cd1b8f12a78b24f'
Conflicts:
include/llvm/CodeGen/ISDOpcodes.h
include/llvm/Target/Target.td
include/llvm/Target/TargetLowering.h
include/llvm/Target/TargetOpcodes.h
lib/Target/Mips/MCTargetDesc/MipsMCCodeEmitter.cpp
lib/Target/Mips/MipsMCInstLower.cpp
utils/TableGen/CodeGenTarget.cpp
Diffstat (limited to 'lib/Support/LockFileManager.cpp')
| -rw-r--r-- | lib/Support/LockFileManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp index d2cb5c969e..7610d281f0 100644 --- a/lib/Support/LockFileManager.cpp +++ b/lib/Support/LockFileManager.cpp @@ -49,7 +49,7 @@ LockFileManager::readLockFile(StringRef LockFileName) { } bool LockFileManager::processStillExecuting(StringRef Hostname, int PID) { -#if LLVM_ON_UNIX +#if LLVM_ON_UNIX && !defined(__ANDROID__) char MyHostname[256]; MyHostname[255] = 0; MyHostname[0] = 0; |