diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-09-04 09:14:45 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2012-09-04 09:14:45 +0000 |
| commit | 68d92bdcc99e647546f40cfce5cfbeb904be2985 (patch) | |
| tree | a626ade038a96ddc5decd9b7c8b5b1bf011df8b7 /lib/Support | |
| parent | 5eae90d727c64ca5b4b43b110521b38dcd9f0de6 (diff) | |
| download | llvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.gz llvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.bz2 llvm-68d92bdcc99e647546f40cfce5cfbeb904be2985.tar.xz | |
Fix Android build of gtest and lib/Support.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163131 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/DynamicLibrary.cpp | 2 | ||||
| -rw-r--r-- | lib/Support/LockFileManager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp index fb02c07e4a..45fec361c1 100644 --- a/lib/Support/DynamicLibrary.cpp +++ b/lib/Support/DynamicLibrary.cpp @@ -160,7 +160,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { // On linux we have a weird situation. The stderr/out/in symbols are both // macros and global variables because of standards requirements. So, we // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first. -#if defined(__linux__) +#if defined(__linux__) and !defined(__ANDROID__) { EXPLICIT_SYMBOL(stderr); EXPLICIT_SYMBOL(stdout); diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp index 64404a1a8e..59bfcfcd25 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; |