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') 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.2.3