cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing preprocessor continuation, indent by the way

Browse Source
This commit is contained in:
Frank Denis 2017-02-28 18:27:06 +01:00
parent 1c2ce89326
commit ab05ce906b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/sodium/runtime.c
View File

@ -149,9 +149,8 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
if ((cpu_info[2] & (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) == if ((cpu_info[2] & (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) ==
(CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) { (CPUID_ECX_AVX | CPUID_ECX_XSAVE | CPUID_ECX_OSXSAVE)) {
uint32_t xcr0 = 0U; uint32_t xcr0 = 0U;
# if defined(HAVE__XGETBV) || # if defined(HAVE__XGETBV) || \
(defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK) && (defined(_MSC_VER) && defined(_XCR_XFEATURE_ENABLED_MASK) && _MSC_FULL_VER >= 160040219)
_MSC_FULL_VER >= 160040219)
xcr0 = (uint32_t) _xgetbv(0); xcr0 = (uint32_t) _xgetbv(0);
# elif defined(_MSC_VER) && defined(_M_IX86) # elif defined(_MSC_VER) && defined(_M_IX86)
__asm { __asm {
@ -165,8 +164,7 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
: "c"((uint32_t) 0U) : "c"((uint32_t) 0U)
: "%edx"); : "%edx");
# endif # endif
if ((xcr0 & (XCR0_SSE | XCR0_AVX)) == (XCR0_SSE | XCR0_AVX)) if ((xcr0 & (XCR0_SSE | XCR0_AVX)) == (XCR0_SSE | XCR0_AVX)) {
{
cpu_features->has_avx = 1; cpu_features->has_avx = 1;
} }
} }