livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace remaining ND_BUILD64BIT_ARCH definitions with ADDRESS_SIZE

master
Ansariel 2018-01-17 14:12:01 +01:00
parent b47c5e02f6
commit 04a10663ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llvfs/lldir_mac.cpp
View File

@ -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

2
indra/newview/llappviewerlinux.cpp
View File

@ -90,7 +90,7 @@ void exportFlashVars()
};
std::string strExpectedArch = "ia32";
#ifdef ND_BUILD64BIT_ARCH
#if ADDRESS_SIZE == 64
strExpectedArch = "x64";
#endif