From 04a10663ff4ec04b9c1a9a5832d1b1a2133d3739 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 17 Jan 2018 14:12:01 +0100
Subject: [PATCH] Replace remaining ND_BUILD64BIT_ARCH definitions with
 ADDRESS_SIZE

---
 indra/llvfs/lldir_mac.cpp          | 4 ++--
 indra/newview/llappviewerlinux.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index a9ee95f50f..e89616f336 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -140,13 +140,13 @@ LLDir_Mac::LLDir_Mac()
             std::string FSCacheDirName = secondLifeString;
             // This was lifted from Cinder's fix for FIRE-8226.
 #ifdef OPENSIM
-  #ifdef ND_BUILD64BIT_ARCH
+  #if ADDRESS_SIZE == 64
                 FSCacheDirName.append("OS_x64");
   #else
                 FSCacheDirName.append("OS");
   #endif
 #else
-  #ifdef ND_BUILD64BIT_ARCH
+  #if ADDRESS_SIZE == 64
                 FSCacheDirName.append("_x64");
   #endif
 #endif // OPENSIM
diff --git a/indra/newview/llappviewerlinux.cpp b/indra/newview/llappviewerlinux.cpp
index 44a879d167..9c5510a739 100644
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -90,7 +90,7 @@ void exportFlashVars()
 	};
 
 	std::string strExpectedArch = "ia32";
-#ifdef ND_BUILD64BIT_ARCH
+#if ADDRESS_SIZE == 64
 	strExpectedArch = "x64";
 #endif