gosthash2012: Provide cmake test for _addcarry_u64

[openssl-gost/engine.git] / gosthash2012.c

diff --git a/gosthash2012.c b/gosthash2012.c
index 6399a9edd2d5dca686c78434de4ecabe0dc9ef33..5a4c64e488d0830beefa34c36c7192114d8ba99f 100644 (file)
--- a/gosthash2012.c
+++ b/gosthash2012.c
@@ -10,8 +10,11 @@
 
 #include "gosthash2012.h"
 #ifdef __x86_64__
-# include <immintrin.h>
-# include <x86intrin.h>
+# ifdef _MSC_VER
+#  include <intrin.h>
+# else
+#  include <x86intrin.h>
+# endif
 #endif
 
 #if defined(_WIN32) || defined(_WINDOWS)
@@ -64,7 +67,7 @@ static INLINE void add512(union uint512_u * RESTRICT x,
     unsigned int CF = 0;
     unsigned int i;
 
-# ifdef __x86_64__
+# ifdef HAVE_ADDCARRY_U64
     for (i = 0; i < 8; i++)
        CF = _addcarry_u64(CF, x->QWORD[i] , y->QWORD[i], &(x->QWORD[i]));
 # else