diff options
| author | callum_linden <none@none> | 2014-10-17 16:02:50 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 16:02:50 -0700 |
| commit | e6bfaa3d5b5ae3d0595cd17be034fcbea9f45dde (patch) | |
| tree | 29c91d86140421877a55ed47f519d55cb247e15b /indra/llplugin/slplugin/slplugin-objc.h | |
| parent | 2a3f022e0ac018345e80da34d4ea6965e5c31de0 (diff) | |
Update to build on Xcode 6.0: fix cocoa NSWindow redefinition error
Diffstat (limited to 'indra/llplugin/slplugin/slplugin-objc.h')
| -rwxr-xr-x | indra/llplugin/slplugin/slplugin-objc.h | 2 |
1 files changed, 2 insertions, 0 deletions
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: */ |