From 4a136572857fcf5d5fd21789a777bbde67c1076d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Sat, 15 Dec 2018 09:13:24 -0500
Subject: SL-10153: auto name{expression} declares an initializer_list instead
 of a variable of type decltype(expression).

Using SHGetKnownFolderPath(FOLDERID_Fonts) in LLFontGL::getFontPathSystem()
requires new Windows #include files.

A variable with a constructor can't be declared within the braces of a switch
statement, even outside any of its case clauses.
---
 indra/llrender/llfontgl.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/llrender')

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index bb56988422..9b43680949 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -44,6 +44,12 @@
 // Third party library includes
 #include <boost/tokenizer.hpp>
 
+#if LL_WINDOWS
+#include <Shlobj.h>
+#include <Knownfolders.h>
+#include <Objbase.h>
+#endif // LL_WINDOWS
+
 const S32 BOLD_OFFSET = 1;
 
 // static class members
-- 
cgit v1.2.3