From ca82036c03dbfc0afc033663e4534c089220c2da Mon Sep 17 00:00:00 2001
From: Mark Berrill <berrillma@ornl.gov>
Date: Mon, 3 Dec 2018 14:37:59 -0500
Subject: [PATCH] Fixing OS detection issue on Summit

---
 common/Utilities.cpp        | 2 +-
 tests/testUtilities.cpp     | 2 +-
 threadpool/atomic_helpers.h | 2 +-
 threadpool/thread_pool.cpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/Utilities.cpp b/common/Utilities.cpp
index f227b8e0..d34385a2 100644
--- a/common/Utilities.cpp
+++ b/common/Utilities.cpp
@@ -35,7 +35,7 @@
     #include <dlfcn.h>
     #include <mach/mach.h>
     #include <unistd.h>
-#elif defined(__linux) || defined(__unix) || defined(__posix)
+#elif defined( __linux ) || defined( __linux__ ) || defined( __unix ) || defined( __posix )
     #define USE_LINUX
     #include <sys/time.h>
     #include <execinfo.h>
diff --git a/tests/testUtilities.cpp b/tests/testUtilities.cpp
index afb3e33b..b084a695 100644
--- a/tests/testUtilities.cpp
+++ b/tests/testUtilities.cpp
@@ -20,7 +20,7 @@
     #define USE_WINDOWS
 #elif defined(__APPLE__)
     #define USE_MAC
-#elif defined(__linux) || defined(__unix) || defined(__posix)
+#elif defined( __linux ) || defined( __linux__ ) || defined( __unix ) || defined( __posix )
     #define USE_LINUX
 #else
     #error Unknown OS
diff --git a/threadpool/atomic_helpers.h b/threadpool/atomic_helpers.h
index 178c1af1..e1eec545 100644
--- a/threadpool/atomic_helpers.h
+++ b/threadpool/atomic_helpers.h
@@ -18,7 +18,7 @@
 // Using MAC
 #define USE_MAC
 #include <libkern/OSAtomic.h>
-#elif defined( __linux ) || defined( __unix ) || defined( __posix )
+#elif defined( __linux ) || defined( __linux__ ) || defined( __unix ) || defined( __posix )
 // Using Linux
 #define USE_LINUX
 #include <unistd.h>
diff --git a/threadpool/thread_pool.cpp b/threadpool/thread_pool.cpp
index 9b0ff4fd..4cf7e222 100644
--- a/threadpool/thread_pool.cpp
+++ b/threadpool/thread_pool.cpp
@@ -26,7 +26,7 @@
     #define USE_WINDOWS
 #elif defined( __APPLE__ )
     #define USE_MAC
-#elif defined( __linux ) || defined( __unix ) || defined( __posix )
+#elif defined( __linux ) || defined( __linux__ ) || defined( __unix ) || defined( __posix )
     #define USE_LINUX
 #else
     #error Unknown OS