projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Corrected OPENSSL_NO_EC_NISTP_64_GCC_128 usage in ec_lcl.h. PR#3370
[oweals/openssl.git]
/
crypto
/
armcap.c
diff --git
a/crypto/armcap.c
b/crypto/armcap.c
index 5258d2fbddfa36be538f869a6fc9cd6c8f9209c7..9abaf396e53e4f5f02a05639d66ccdd9cc023495 100644
(file)
--- a/
crypto/armcap.c
+++ b/
crypto/armcap.c
@@
-23,7
+23,7
@@
unsigned int _armv7_tick(void);
unsigned int OPENSSL_rdtsc(void)
{
- if (OPENSSL_armcap_P
|
ARMV7_TICK)
+ if (OPENSSL_armcap_P
&
ARMV7_TICK)
return _armv7_tick();
else
return 0;