From 4e55456d8b6538a0fbfa67e6852453df7efa3424 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 20:40:57 -0700
Subject: Update to build on Xcode 6.0: Change tactic about turning off
 warnings about -Wdelete-incomplete in anywhere lluictrlfactory.h is used -
 richard okay'd

---
 indra/llui/llrngwriter.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/llui/llrngwriter.cpp')

diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp
index cd9fe3610e..523bc7c667 100755
--- a/indra/llui/llrngwriter.cpp
+++ b/indra/llui/llrngwriter.cpp
@@ -28,7 +28,16 @@
 
 #include "llrngwriter.h"
 #include "lluicolor.h"
+
+#if LL_DARWIN
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#include "lluictrlfactory.h"
+#pragma clang diagnostic pop
+#elif
 #include "lluictrlfactory.h"
+#endif
+
 #include "boost/bind.hpp"
 
 static 	LLInitParam::Parser::parser_read_func_map_t sReadFuncs;
-- 
cgit v1.3


From 6bb3fc93926e93154d9651e16e131ffa4c805a2e Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Wed, 10 Dec 2014 13:02:36 -0800
Subject: Fix for incorrectly formatted #if statements (worked on clang FWIW!)

---
 indra/llkdu/llimagej2ckdu.h  | 2 +-
 indra/llkdu/llkdumem.h       | 2 +-
 indra/llui/llrngwriter.cpp   | 2 +-
 indra/llui/lluictrlfactory.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/llui/llrngwriter.cpp')

diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h
index 762476ce69..02281152bf 100755
--- a/indra/llkdu/llimagej2ckdu.h
+++ b/indra/llkdu/llimagej2ckdu.h
@@ -43,7 +43,7 @@
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #include "kdu_compressed.h"
 #pragma clang diagnostic pop
-#elif
+#else
 #include "kdu_compressed.h"
 #endif
 
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h
index a0d304868e..fab913d93b 100755
--- a/indra/llkdu/llkdumem.h
+++ b/indra/llkdu/llkdumem.h
@@ -36,7 +36,7 @@
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #include "kdu_image.h"
 #pragma clang diagnostic pop
-#elif
+#else
 #include "kdu_image.h"
 #endif
 
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp
index 523bc7c667..e4a31d6a79 100755
--- a/indra/llui/llrngwriter.cpp
+++ b/indra/llui/llrngwriter.cpp
@@ -34,7 +34,7 @@
 #pragma clang diagnostic ignored "-Wdelete-incomplete"
 #include "lluictrlfactory.h"
 #pragma clang diagnostic pop
-#elif
+#else
 #include "lluictrlfactory.h"
 #endif
 
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 17af45cc0c..3ce39c947f 100755
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -189,7 +189,7 @@ public:
 #pragma clang diagnostic ignored "-Wdelete-incomplete"
 					delete view;
 #pragma clang diagnostic pop
-#elif
+#else
 					delete view;
 #endif
 					view = NULL;
-- 
cgit v1.3