From 4cc4a89b67afe09768abfc8041231348e355c475 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 9 Aug 2020 20:25:06 -0400
Subject: [PATCH] Supress misleading indentation warning from glh_linear

---
 indra/llprimitive/lldaeloader.cpp   | 7 +++++++
 indra/llprimitive/llmodelloader.cpp | 7 +++++++
 indra/llrender/llgl.h               | 7 +++++++
 indra/llrender/llrender.h           | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 36ad8b3da45..5a3fb98ba34 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -59,7 +59,14 @@
 #include "llsdserialize.h"
 #include "lljoint.h"
 
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 #include "llmatrix4a.h"
 
 #include <boost/regex.hpp>
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index b0833c1e3d7..d653fe70b9f 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -30,7 +30,14 @@
 #include "llcallbacklist.h"
 #include "lltimer.h"
 
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 #include "llmatrix4a.h"
 #include <boost/bind.hpp>
 
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 30fe5e3f679..7f6fffef877 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -43,7 +43,14 @@
 #include "llinstancetracker.h"
 
 #include "llglheaders.h"
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 
 extern BOOL gDebugGL;
 extern BOOL gDebugSession;
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 41f4fe40176..db37db80e1b 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -42,7 +42,14 @@
 #include "llpointer.h"
 #include "llglheaders.h"
 #include "llmatrix4a.h"
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 
 class LLVertexBuffer;
 class LLCubeMap;
-- 
GitLab