From 16b768370b8587f63231f9bbc06ab48b58a4f15e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 4 Oct 2019 08:45:00 -0400
Subject: [PATCH] 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(-)
diff --git a/indra/llcommon/StackWalker.cpp b/indra/llcommon/StackWalker.cpp
index 7a7230db4b7..56defc6465f 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 <dbghelp.h>
#pragma warning (pop)
@@ -660,7 +660,7 @@ struct IMAGEHLP_MODULE64_V2 {
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 7084fe6f602..80057bf0f21 100644
--- a/indra/llcommon/llstacktrace.cpp
+++ b/indra/llcommon/llstacktrace.cpp
@@ -33,7 +33,7 @@
#include <sstream>
#include "llwin32headerslean.h"
-#pragma warning (push)
+#pragma warning (push)
#pragma warning (disable:4091) // a microsoft header has warnings. Very nice.
#include <dbghelp.h>
#pragma warning (pop)
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
index 05f245b3114..524adba6529 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 <dbghelp.h>
#pragma warning (pop)
--
GitLab