From daeeab36eb2684e74f978cb083a2e6535370896d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 25 Oct 2018 11:09:57 -0400 Subject: DRTVWR-476: Eliminate unnecessary typedefs from struct, enum decls. With VS 2017, these produced fatal warnings. --- indra/llcommon/StackWalker.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/StackWalker.cpp') diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp index c0d3104099..d34ad9a369 100644 --- a/indra/llcommon/StackWalker.cpp +++ b/indra/llcommon/StackWalker.cpp @@ -422,7 +422,7 @@ public: LPSTR m_szSymPath; #pragma pack(push,8) -typedef struct IMAGEHLP_MODULE64_V3 { +struct IMAGEHLP_MODULE64_V3 { DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64) DWORD64 BaseOfImage; // base load address of module DWORD ImageSize; // virtual size of the loaded module @@ -450,7 +450,7 @@ typedef struct IMAGEHLP_MODULE64_V3 { BOOL Publics; // contains public symbols }; -typedef struct IMAGEHLP_MODULE64_V2 { +struct IMAGEHLP_MODULE64_V2 { DWORD SizeOfStruct; // set to sizeof(IMAGEHLP_MODULE64) DWORD64 BaseOfImage; // base load address of module DWORD ImageSize; // virtual size of the loaded module -- cgit v1.3 From b09770946a8ae3396517c6796d1bff2a1707de26 Mon Sep 17 00:00:00 2001 From: Anchor Date: Wed, 15 May 2019 03:57:10 -0600 Subject: [DRTVWR-476] - disable dbghelp.h warnings --- autobuild.xml | 2 +- build.sh | 1 - indra/llcommon/StackWalker.cpp | 3 +++ indra/newview/llwindebug.h | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/StackWalker.cpp') diff --git a/autobuild.xml b/autobuild.xml index 8afc8db46b..a9525e6bbc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3755,7 +3755,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors windows build_directory - build-vc${AUTOBUILD_VSVER|120}-$AUTOBUILD_ADDRSIZE + build-vc${AUTOBUILD_VSVER|150}-$AUTOBUILD_ADDRSIZE configurations RelWithDebInfo diff --git a/build.sh b/build.sh index bafee86206..545c913f92 100755 --- a/build.sh +++ b/build.sh @@ -140,7 +140,6 @@ pre_build() "$autobuild" configure --quiet -c $variant -- \ -DPACKAGE:BOOL=ON \ -DHAVOK:BOOL="$HAVOK" \ - -DCMAKE_SYSTEM_VERSION:STRING="10.0" \ -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \ -DVIEWER_SYMBOL_FILE:STRING="${VIEWER_SYMBOL_FILE:-}" \ -DBUGSPLAT_DB:STRING="${BUGSPLAT_DB:-}" \ diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp index d34ad9a369..7a7230db4b 100644 --- a/indra/llcommon/StackWalker.cpp +++ b/indra/llcommon/StackWalker.cpp @@ -98,7 +98,10 @@ // If VC7 and later, then use the shipped 'dbghelp.h'-file #pragma pack(push,8) #if _MSC_VER >= 1300 +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include +#pragma warning (pop) #else // inline the important dbghelp.h-declarations... typedef enum { diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h index 7e5818ba1c..05f245b311 100644 --- a/indra/newview/llwindebug.h +++ b/indra/newview/llwindebug.h @@ -29,7 +29,11 @@ #include "stdtypes.h" #include "llwin32headerslean.h" + +#pragma warning (push) +#pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include +#pragma warning (pop) class LLWinDebug: public LLSingleton -- cgit v1.3 From 16b768370b8587f63231f9bbc06ab48b58a4f15e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 4 Oct 2019 08:45:00 -0400 Subject: DRTVWR-476: Fix Windows line endings --- indra/llcommon/StackWalker.cpp | 4 ++-- indra/llcommon/llstacktrace.cpp | 2 +- indra/newview/llwindebug.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/llcommon/StackWalker.cpp') diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp index 7a7230db4b..56defc6465 100644 --- a/indra/llcommon/StackWalker.cpp +++ b/indra/llcommon/StackWalker.cpp @@ -98,7 +98,7 @@ // If VC7 and later, then use the shipped 'dbghelp.h'-file #pragma pack(push,8) #if _MSC_VER >= 1300 -#pragma warning (push) +#pragma warning (push) #pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include #pragma warning (pop) @@ -660,7 +660,7 @@ private: pGMI = (tGMI) GetProcAddress( hPsapi, "GetModuleInformation" ); if ( (pEPM == NULL) || (pGMFNE == NULL) || (pGMBN == NULL) || (pGMI == NULL) ) { - // we couldnīt find all functions + // we couldn't find all functions FreeLibrary(hPsapi); return FALSE; } diff --git a/indra/llcommon/llstacktrace.cpp b/indra/llcommon/llstacktrace.cpp index 7084fe6f60..80057bf0f2 100644 --- a/indra/llcommon/llstacktrace.cpp +++ b/indra/llcommon/llstacktrace.cpp @@ -33,7 +33,7 @@ #include #include "llwin32headerslean.h" -#pragma warning (push) +#pragma warning (push) #pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include #pragma warning (pop) diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h index 05f245b311..524adba652 100644 --- a/indra/newview/llwindebug.h +++ b/indra/newview/llwindebug.h @@ -29,8 +29,8 @@ #include "stdtypes.h" #include "llwin32headerslean.h" - -#pragma warning (push) + +#pragma warning (push) #pragma warning (disable:4091) // a microsoft header has warnings. Very nice. #include #pragma warning (pop) -- cgit v1.3