From e6bfaa3d5b5ae3d0595cd17be034fcbea9f45dde Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 17 Oct 2014 16:02:50 -0700
Subject: Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error

---
 indra/llplugin/slplugin/slplugin-objc.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llplugin/slplugin/slplugin-objc.h')

diff --git a/indra/llplugin/slplugin/slplugin-objc.h b/indra/llplugin/slplugin/slplugin-objc.h
index f2c2b3239c..af0ebe1af2 100755
--- a/indra/llplugin/slplugin/slplugin-objc.h
+++ b/indra/llplugin/slplugin/slplugin-objc.h
@@ -29,7 +29,9 @@
  */
 
 //Protos for ObjectiveC classes (cannot import cocoa here due to BOOL conflict)
+#ifndef __OBJC__
 class NSWindow;
+#endif // __OBJC__
 
 /* Defined in slplugin-objc.mm: */
 
-- 
cgit v1.2.3