From 23354f26178872a4a7230a32e17470ad48bf9baa Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Sat, 21 Apr 2018 23:39:44 +0200
Subject: [PATCH] OSX doesn't like std::atomic_uint32_t/std::atomic_int32_t
 either and prefers atomic_uint/atomic_int

---
 indra/llcommon/llapr.h             | 2 +-
 indra/llcommon/llinstancetracker.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h
index cafa771c22..f5eaef0733 100644
--- a/indra/llcommon/llapr.h
+++ b/indra/llcommon/llapr.h
@@ -196,7 +196,7 @@ private:
 };
 
 // ND: Typedefs for specialized versions. Using std::atomic_(u)int32_t to get the optimzed implementation.
-#ifndef LL_LINUX
+#ifdef LL_WINDOWS
 typedef LLAtomicBase<U32, std::atomic_uint32_t> LLAtomicU32;
 typedef LLAtomicBase<S32, std::atomic_int32_t> LLAtomicS32;
 #else
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
index a66aa2fb63..8838e25196 100644
--- a/indra/llcommon/llinstancetracker.h
+++ b/indra/llcommon/llinstancetracker.h
@@ -82,7 +82,7 @@ protected:
 		void decrementDepth();
 		U32 getDepth();
 	private:
-	#ifndef LL_LINUX
+	#ifdef LL_WINDOWS
 		std::atomic_uint32_t sIterationNestDepth;
 	#else
 		std::atomic_uint sIterationNestDepth;