[Support] reorder Threading includes to avoid conflict with FreeBSD headers

FreeBSD's condvar.h (included by user.h in Threading.inc) uses a "struct
thread" that conflicts with llvm::thread if both are visible when it's
included.

So this moves our #include after the FreeBSD code.

1 files changed, 9 insertions, 6 deletions

diff --git a/llvm/lib/Support/Unix/Threading.inc b/llvm/lib/Support/Unix/Threading.inc
index 2131def..5de1cf0 100644
--- a/llvm/lib/Support/Unix/Threading.inc
+++ b/llvm/lib/Support/Unix/Threading.inc
@@ -48,9 +48,10 @@
 #include <unistd.h>      // For syscall()
 #endif
 
+namespace llvm {
 pthread_t
-llvm::llvm_execute_on_thread_impl(void *(*ThreadFunc)(void *), void *Arg,
-                                  llvm::Optional<unsigned> StackSizeInBytes) {
+llvm_execute_on_thread_impl(void *(*ThreadFunc)(void *), void *Arg,
+                            llvm::Optional<unsigned> StackSizeInBytes) {
   int errnum;
 
   // Construct the attributes object.
@@ -80,7 +81,7 @@ llvm::llvm_execute_on_thread_impl(void *(*ThreadFunc)(void *), void *Arg,
   return Thread;
 }
 
-void llvm::llvm_thread_detach_impl(pthread_t Thread) {
+void llvm_thread_detach_impl(pthread_t Thread) {
   int errnum;
 
   if ((errnum = ::pthread_detach(Thread)) != 0) {
@@ -88,7 +89,7 @@ void llvm::llvm_thread_detach_impl(pthread_t Thread) {
   }
 }
 
-void llvm::llvm_thread_join_impl(pthread_t Thread) {
+void llvm_thread_join_impl(pthread_t Thread) {
   int errnum;
 
   if ((errnum = ::pthread_join(Thread, nullptr)) != 0) {
@@ -96,14 +97,16 @@ void llvm::llvm_thread_join_impl(pthread_t Thread) {
   }
 }
 
-pthread_t llvm::llvm_thread_get_id_impl(pthread_t Thread) {
+pthread_t llvm_thread_get_id_impl(pthread_t Thread) {
   return Thread;
 }
 
-pthread_t llvm::llvm_thread_get_current_id_impl() {
+pthread_t llvm_thread_get_current_id_impl() {
   return ::pthread_self();
 }
 
+} // namespace llvm
+
 uint64_t llvm::get_threadid() {
 #if defined(__APPLE__)
   // Calling "mach_thread_self()" bumps the reference count on the thread