diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-14 08:38:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-14 08:38:12 +0200 |
| commit | c2f081d17484d2efbc2b294f89f4cb59b1937a9c (patch) | |
| tree | bcf4fd6fe131ffe66a85060126978348b79d6d76 /external/nss/clang-cl.patch.0 | |
| parent | d4bd86f52d5a7d8ac0125132451911d9b51a6c58 (diff) | |
Silence clang-cl -Wpragma-pack in external/nss
Change-Id: I08672659e7ff1e7ddf3f2185faba5aeab3fd2239
Diffstat (limited to 'external/nss/clang-cl.patch.0')
| -rw-r--r-- | external/nss/clang-cl.patch.0 | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0 index 98786d49971c..684cf74d3ca6 100644 --- a/external/nss/clang-cl.patch.0 +++ b/external/nss/clang-cl.patch.0 @@ -72,3 +72,40 @@ /* This magic gets the windows compiler to give us a deprecation * warning */ #pragma deprecated(CKT_NSS_UNTRUSTED, CKT_NSS_MUST_VERIFY, CKT_NSS_VALID) + +# While MSVC uses +# #pragma warning(disable : 4103) +# in the inner pkcs11p.h, clang-cl wants +# #pragma clang diagnostic ignored "-Wpragma-pack" +# in the outer pkcs11t.h: +--- nss/lib/util/pkcs11t.h ++++ nss/lib/util/pkcs11t.h +@@ -72,7 +72,14 @@ + #define CK_INVALID_HANDLE 0 + + /* pack */ ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wpragma-pack" ++#endif + #include "pkcs11p.h" ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic pop ++#endif + + typedef struct CK_VERSION { + CK_BYTE major; /* integer portion of version number */ +@@ -1795,6 +1802,13 @@ + #include "pkcs11n.h" + + /* undo packing */ ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wpragma-pack" ++#endif + #include "pkcs11u.h" ++#if defined __clang__ && defined _MSC_VER ++#pragma clang diagnostic pop ++#endif + + #endif |