diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 10:01:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 10:11:15 +0100 |
| commit | 69ae92100401aad31cbfe1c4b4247befffb2d80a (patch) | |
| tree | 76cbe39dc1676d00e0ef07e0258bb7fd9bb838f0 | |
| parent | 61b541e9ef725ea75cf2e5c8407b0b8fa151fb1b (diff) | |
external/nss: -Werror,-Wundef (__GNUC__ vs. clang-cl)
Change-Id: I4641767451ac1ec9f580d24bafa57a11e2f99ac3
| -rw-r--r-- | external/nss/clang-cl.patch.0 | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0 index 48f0ba85b32a..a76050d211eb 100644 --- a/external/nss/clang-cl.patch.0 +++ b/external/nss/clang-cl.patch.0 @@ -23,6 +23,15 @@ # include <intrin.h> # pragma intrinsic(_BitScanForward,_BitScanReverse) __forceinline static int __prBitScanForward32(unsigned int val) +@@ -32,7 +32,7 @@ + # define pr_bitscan_ctz32(val) __prBitScanForward32(val) + # define pr_bitscan_clz32(val) __prBitScanReverse32(val) + # define PR_HAVE_BUILTIN_BITSCAN32 +-#elif ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \ ++#elif defined __GNUC__ && ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \ + (defined(__i386__) || defined(__x86_64__) || defined(__arm__)) + # define pr_bitscan_ctz32(val) __builtin_ctz(val) + # define pr_bitscan_clz32(val) __builtin_clz(val) @@ -136,7 +136,7 @@ */ @@ -32,8 +41,17 @@ #include <stdlib.h> #pragma intrinsic(_rotl, _rotr) #define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits) ---- nss/lib/certdb/certdb.h 2016-02-12 15:36:18.000000000 +0100 -+++ nss/lib/certdb/certdb.h 2016-02-23 21:08:34.607903348 +0100 +--- nss/lib/certdb/certdb.h ++++ nss/lib/certdb/certdb.h +@@ -21,7 +21,7 @@ + /* On Windows, Mac, and Linux (and other gcc platforms), we can give compile + * time deprecation warnings when applications use the old CERTDB_VALID_PEER + * define */ +-#if __GNUC__ > 3 ++#if defined __GNUC__ && __GNUC__ > 3 + #if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5) + typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated)); + #else @@ -30,7 +30,7 @@ #endif #define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER)CERTDB_TERMINAL_RECORD) |