Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error

2014-10-17 16:02:50 -07:00 · 2014-10-17 16:02:50 -07:00 · e6bfaa3d5b
parent 2a3f022e0a
commit e6bfaa3d5b
1 changed files with 2 additions and 0 deletions
--- 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: */