diff options
| author | Jack Lloyd <[email protected]> | 2017-08-31 13:13:00 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-31 13:13:00 -0400 |
| commit | 16af7b986dbf9b04be45cdc075d70f81238269ad (patch) | |
| tree | 6eee61aedd20fdbc364cb0f563ab87158eb8f9b9 /src/lib/utils | |
| parent | c1e399ab2988284b431667ad514f6d31a32fea8f (diff) | |
| parent | 0c33ef96d779ca781287006e4a55361ee76981a5 (diff) | |
Merge GH #1169 Add LLVM bitcode target
Diffstat (limited to 'src/lib/utils')
| -rw-r--r-- | src/lib/utils/mutex.h | 2 | ||||
| -rw-r--r-- | src/lib/utils/os_utils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/utils/mutex.h b/src/lib/utils/mutex.h index 0daea3148..2aabd2973 100644 --- a/src/lib/utils/mutex.h +++ b/src/lib/utils/mutex.h @@ -21,7 +21,7 @@ typedef std::mutex mutex_type; } -#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIKERNEL) +#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIKERNEL) || defined(BOTAN_TARGET_OS_IS_LLVM) // No threads diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp index e887d6e76..d08e7e040 100644 --- a/src/lib/utils/os_utils.cpp +++ b/src/lib/utils/os_utils.cpp @@ -34,7 +34,7 @@ uint32_t OS::get_process_id() return ::getpid(); #elif defined(BOTAN_TARGET_OS_IS_WINDOWS) || defined(BOTAN_TARGET_OS_IS_MINGW) return ::GetCurrentProcessId(); -#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIKERNEL) +#elif defined(BOTAN_TARGET_OS_TYPE_IS_UNIKERNEL) || defined(BOTAN_TARGET_OS_IS_LLVM) return 0; // truly no meaningful value #else #error "Missing get_process_id" |