From 96ea56a4717d558f211daa06a6570df06f41e8cb Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 12 May 2014 10:30:52 -0700 Subject: [PATCH] Rename cpu_features global to _cpu_features --- src/libsodium/sodium/runtime.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libsodium/sodium/runtime.c b/src/libsodium/sodium/runtime.c index a375c654..dd3800ba 100644 --- a/src/libsodium/sodium/runtime.c +++ b/src/libsodium/sodium/runtime.c @@ -12,7 +12,7 @@ typedef struct CPUFeatures_ { int has_sse3; } CPUFeatures; -static CPUFeatures cpu_features; +static CPUFeatures _cpu_features; #define CPUID_SSE2 0x04000000 #define CPUIDECX_SSE3 0x00000001 @@ -112,24 +112,24 @@ sodium_runtime_get_cpu_features(void) { int ret = -1; - ret &= _sodium_runtime_arm_cpu_features(&cpu_features); - ret &= _sodium_runtime_intel_cpu_features(&cpu_features); - cpu_features.initialized = 1; + ret &= _sodium_runtime_arm_cpu_features(&_cpu_features); + ret &= _sodium_runtime_intel_cpu_features(&_cpu_features); + _cpu_features.initialized = 1; return ret; } int sodium_runtime_has_neon(void) { - return cpu_features.has_neon; + return _cpu_features.has_neon; } int sodium_runtime_has_sse2(void) { - return cpu_features.has_sse2; + return _cpu_features.has_sse2; } int sodium_runtime_has_sse3(void) { - return cpu_features.has_sse3; + return _cpu_features.has_sse3; }