diff options
| author | Masatoshi Kimura <VYV03354@nifty.ne.jp> | 2018-07-20 20:37:58 +0900 |
|---|---|---|
| committer | Masatoshi Kimura <VYV03354@nifty.ne.jp> | 2018-07-20 20:37:58 +0900 |
| commit | b300d71214f1ad3eaf5c30a35c9e6cc3ac8ba086 (patch) | |
| tree | 9f300511e2ba4e746ed2a64155bf8ffc0d25d323 | |
| parent | 2901e03c3521a053e6b88327fe6e8cf53efb6311 (diff) | |
| download | nss-hg-b300d71214f1ad3eaf5c30a35c9e6cc3ac8ba086.tar.gz | |
Bug 1472254 - Suppress -Wpragma-pack warning spam
| -rw-r--r-- | lib/util/pkcs11p.h | 5 | ||||
| -rw-r--r-- | lib/util/pkcs11u.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/util/pkcs11p.h b/lib/util/pkcs11p.h index 2e904ee50..1c9201350 100644 --- a/lib/util/pkcs11p.h +++ b/lib/util/pkcs11p.h @@ -13,7 +13,10 @@ * though it's still needed. put in a central file to help merging.. */ -#if defined(_WIN32) +#if defined(_WIN32) || defined(_WINDOWS) +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wpragma-pack" +#endif #ifdef _MSC_VER #pragma warning(disable : 4103) #endif diff --git a/lib/util/pkcs11u.h b/lib/util/pkcs11u.h index be949bcd4..64ec2fdb5 100644 --- a/lib/util/pkcs11u.h +++ b/lib/util/pkcs11u.h @@ -11,7 +11,10 @@ * reset any packing set by pkcs11p.h */ -#if defined(_WIN32) +#if defined(_WIN32) || defined(_WINDOWS) +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wpragma-pack" +#endif #ifdef _MSC_VER #pragma warning(disable : 4103) #endif |