diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 08:55:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-24 08:55:20 -0400 |
| commit | 3ae8a821c3b627f3b02df636e7649f28b97d6f57 (patch) | |
| tree | 79d5d3f2b262b7f5d60cc6135b80221878aa74b8 /indra/llkdu/llkdumem.h | |
| parent | 39b17157f9c31a4b911113561d4fc8f86396c430 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
merge
Diffstat (limited to 'indra/llkdu/llkdumem.h')
| -rwxr-xr-x | indra/llkdu/llkdumem.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llkdu/llkdumem.h b/indra/llkdu/llkdumem.h index dbdf88b2d9..fab913d93b 100755 --- a/indra/llkdu/llkdumem.h +++ b/indra/llkdu/llkdumem.h @@ -29,7 +29,17 @@ // 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 +#else +#include "kdu_image.h" +#endif + #include "kdu_elementary.h" #include "kdu_messaging.h" #include "kdu_params.h" |