From 0638fafe661075512535f4a1b44fe8979162151b Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 8 May 2011 12:46:42 -0500 Subject: [PATCH 1/2] Fixing Win compile. (Partial) --- indra/cmake/ViewerMiscLibs.cmake | 2 +- indra/llcommon/aithreadsafe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index 38d044473..e52492c38 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -2,9 +2,9 @@ include(Prebuilt) if (NOT STANDALONE) - use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) if(LINUX) + use_prebuilt_binary(libuuid) if (${ARCH} STREQUAL "x86_64") use_prebuilt_binary(32bitcompatibilitylibs) endif (${ARCH} STREQUAL "x86_64") diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h index 70cd2a3db..0d0a6ac1d 100644 --- a/indra/llcommon/aithreadsafe.h +++ b/indra/llcommon/aithreadsafe.h @@ -288,7 +288,7 @@ protected: //! Constructor used by AIWriteAccess. AIReadAccess(AIThreadSafe& wrapper, state_type state) : AIReadAccessConst(wrapper, state) { } - friend class AIWriteAccess; + friend struct AIWriteAccess; }; /** From 2529644e900b9fa2abae689c1412916ad3cce834 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sun, 8 May 2011 16:25:03 -0500 Subject: [PATCH 2/2] Should now compile on VC100 again. --- indra/llcommon/llsys.cpp | 2 +- indra/newview/llfloaterabout.cpp | 1 - indra/newview/llweb.cpp | 2 +- indra/newview/llwindebug.cpp | 3 ++- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index d729d9883..bde0cbd6e 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -74,7 +74,7 @@ extern int errno; static const S32 CPUINFO_BUFFER_SIZE = 16383; -LLCPUInfo gSysCPU; +LL_COMMON_API LLCPUInfo gSysCPU; #if LL_WINDOWS #ifndef DLLVERSIONINFO diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index ed4e378e3..62b0ee495 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -75,7 +75,6 @@ -extern LLCPUInfo gSysCPU; extern LLMemoryInfo gSysMemory; extern U32 gPacketsIn; diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp index b57e4bcc8..5bca8db8e 100644 --- a/indra/newview/llweb.cpp +++ b/indra/newview/llweb.cpp @@ -74,7 +74,7 @@ std::string LLWeb::curlEscape(const std::string& url) std::stringstream escaped_url; for (std::string::const_iterator iter = url.begin(); iter != url.end(); ++iter) { - if (std::isalnum(*iter)) + if (isalnum(*iter)) escaped_url << *iter; else escaped_url << '%' << std::hex << std::setfill('0') << std::setw(2) << std::uppercase << (int)*iter; diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp index 59bc9dc62..bc8281480 100644 --- a/indra/newview/llwindebug.cpp +++ b/indra/newview/llwindebug.cpp @@ -862,7 +862,8 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop // Since there is exception info... Release the hounds. gEmergencyMemoryReserve.release(); - if(gSavedSettings.getControl("SaveMinidump").notNull() && gSavedSettings.getBOOL("SaveMinidump")) + LLControlVariable* save_minimap = gSavedSettings.getControl("SaveMinidump"); + if(save_minimap && save_minimap->getValue().asBoolean()) { _MINIDUMP_EXCEPTION_INFORMATION ExInfo;