summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEhsan Akhgari <ehsan@mozilla.com>2016-01-04 11:00:44 -0800
committerEhsan Akhgari <ehsan@mozilla.com>2016-01-04 11:00:44 -0800
commit033dee6b2e67b4a3259fe96578b5bf1ed8bd4c2c (patch)
treebb3d750bcd937b5e5c27a5fa70886f9f3f96f454
parent1edac205bb4aff48adacea1def8a135a31f3d34e (diff)
downloadnss-hg-033dee6b2e67b4a3259fe96578b5bf1ed8bd4c2c.tar.gz
Bug 1233981: Add #include <intrin.h> to rijndael.c for _xgetbv(). r=wtc
-rw-r--r--lib/freebl/rijndael.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/freebl/rijndael.c b/lib/freebl/rijndael.c
index 4e4be79fd..8b3704bed 100644
--- a/lib/freebl/rijndael.c
+++ b/lib/freebl/rijndael.c
@@ -30,6 +30,9 @@ static PRBool use_hw_aes = PR_FALSE;
static int has_intel_avx = 0;
static int has_intel_clmul = 0;
static PRBool use_hw_gcm = PR_FALSE;
+#if defined(_MSC_VER) && !defined(_M_IX86)
+#include <intrin.h> /* for _xgetbv() */
+#endif
#endif
#endif /* USE_HW_AES */