diff options
| author | callum_linden <none@none> | 2014-10-20 16:02:03 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 16:02:03 -0700 |
| commit | f3baf8dc4e900a4e8d4005e31f20be2bae162a56 (patch) | |
| tree | b7258de470c1c20433ea7236189a45c93c6f979c /indra/llkdu | |
| parent | cad1df584be0ed62e4ae0393b84e57f192009da5 (diff) | |
Update to build on Xcode 6.0: remove #pragmas from code to deal with tut warnigs/errors (moved to package) AND bracket clang #pragmas in #if LL_DARWIN
Diffstat (limited to 'indra/llkdu')
| -rwxr-xr-x | indra/llkdu/llimagej2ckdu.h | 4 | ||||
| -rwxr-xr-x | indra/llkdu/llkdumem.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llkdu/llimagej2ckdu.h b/indra/llkdu/llimagej2ckdu.h index e3b0452293..762476ce69 100755 --- a/indra/llkdu/llimagej2ckdu.h +++ b/indra/llkdu/llimagej2ckdu.h @@ -38,10 +38,14 @@ #include "kdu_params.h" // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_compressed.h" #pragma clang diagnostic pop +#elif +#include "kdu_compressed.h" +#endif #include "kdu_sample_processing.h" diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index 892826f199..a0d304868e 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -30,11 +30,16 @@ // Support classes for reading and writing from memory buffers in KDU #define KDU_NO_THREADS // don't *really* want to rebuild KDU so turn off specific warnings for this header +#if LL_DARWIN #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wself-assign-field" #pragma clang diagnostic ignored "-Wunused-private-field" #include "kdu_image.h" #pragma clang diagnostic pop +#elif +#include "kdu_image.h" +#endif + #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" |