diff options
Diffstat (limited to 'llvm/lib/Support/Threading.cpp')
| -rw-r--r-- | llvm/lib/Support/Threading.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/lib/Support/Threading.cpp b/llvm/lib/Support/Threading.cpp index ba92a3e..04a1a9e 100644 --- a/llvm/lib/Support/Threading.cpp +++ b/llvm/lib/Support/Threading.cpp @@ -15,7 +15,6 @@ #include "llvm/ADT/Optional.h" #include "llvm/Config/config.h" #include "llvm/Support/Host.h" -#include "llvm/Support/thread.h" #include <cassert> #include <errno.h> @@ -78,6 +77,11 @@ unsigned llvm::ThreadPoolStrategy::compute_thread_count() const { #include "Windows/Threading.inc" #endif +// Must be included after Threading.inc to provide definition for llvm::thread +// because FreeBSD's condvar.h (included by user.h) misuses the "thread" +// keyword. +#include "llvm/Support/thread.h" + #if defined(__APPLE__) // Darwin's default stack size for threads except the main one is only 512KB, // which is not enough for some/many normal LLVM compilations. This implements |