diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-21 22:30:29 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-02-22 00:34:30 +0100 |
| commit | e175adcd46d9c7850a8182314c0f89012ee757fc (patch) | |
| tree | b3fa2c9b2daa6e34953d0d7441042aab9ff641c6 /src/Crypto | |
| parent | 0c0ea60b777f64fed7a44c1bf135266af867afa2 (diff) | |
| download | VeraCrypt-e175adcd46d9c7850a8182314c0f89012ee757fc.tar.gz VeraCrypt-e175adcd46d9c7850a8182314c0f89012ee757fc.zip | |
Windows: correct static inline declaration to solve Windows compilation error
Diffstat (limited to 'src/Crypto')
| -rwxr-xr-x | src/Crypto/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Crypto/cpu.c b/src/Crypto/cpu.c index 766edea8..58a131af 100755 --- a/src/Crypto/cpu.c +++ b/src/Crypto/cpu.c @@ -167,7 +167,7 @@ int g_x86DetectionDone = 0; int g_hasISSE = 0, g_hasSSE2 = 0, g_hasSSSE3 = 0, g_hasMMX = 0, g_hasAESNI = 0, g_hasCLMUL = 0, g_isP4 = 0;
uint32 g_cacheLineSize = CRYPTOPP_L1_CACHE_LINE_SIZE;
-static inline int IsIntel(const uint32 output[4])
+VC_INLINE int IsIntel(const uint32 output[4])
{
// This is the "GenuineIntel" string
return (output[1] /*EBX*/ == 0x756e6547) &&
@@ -175,7 +175,7 @@ static inline int IsIntel(const uint32 output[4]) (output[3] /*EDX*/ == 0x49656e69);
}
-static inline int IsAMD(const uint32 output[4])
+VC_INLINE int IsAMD(const uint32 output[4])
{
// This is the "AuthenticAMD" string
return (output[1] /*EBX*/ == 0x68747541) &&
|