diff options
| -rwxr-xr-x | indra/llkdu/llimagej2ckdu.h | 4 | ||||
| -rwxr-xr-x | indra/llkdu/llkdumem.h | 5 | ||||
| -rwxr-xr-x | indra/test/llapp_tut.cpp | 4 | ||||
| -rwxr-xr-x | indra/test/llbuffer_tut.cpp | 7 | ||||
| -rwxr-xr-x | indra/test/llpermissions_tut.cpp | 7 |
5 files changed, 9 insertions, 18 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" diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp index 5dad838a44..aa5c0672e6 100755 --- a/indra/test/llapp_tut.cpp +++ b/indra/test/llapp_tut.cpp @@ -25,11 +25,7 @@ * $/LicenseInfo$ */ -// turn off warnings about unused functions from clang for tut package -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include <tut/tut.hpp> -#pragma clang diagnostic pop #include "linden_common.h" #include "llapp.h" diff --git a/indra/test/llbuffer_tut.cpp b/indra/test/llbuffer_tut.cpp index 10a23c688a..9b8aae6a73 100755 --- a/indra/test/llbuffer_tut.cpp +++ b/indra/test/llbuffer_tut.cpp @@ -26,14 +26,7 @@ * $/LicenseInfo$ */ -#if LL_DARWIN -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include <tut/tut.hpp> -#pragma clang diagnostic pop -#elif -#include <tut/tut.hpp> -#endif #include "linden_common.h" #include "lltut.h" diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp index 32a016466d..fa4b085fd3 100755 --- a/indra/test/llpermissions_tut.cpp +++ b/indra/test/llpermissions_tut.cpp @@ -29,14 +29,7 @@ #include <tut/tut.hpp> #include "linden_common.h" -#if LL_DARWIN -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-function" #include "lltut.h" -#pragma clang diagnostic pop -#elif -#include "lltut.h" -#endif #include "message.h" #include "llpermissions.h" |