2
0
Fork 0
mirror of https://git.sr.ht/~sircmpwn/mkproof synced 2024-05-28 05:36:12 +02:00

Generalise MSVC-specific changes to mingw-w64

This commit is contained in:
David Allsopp 2020-04-10 21:37:37 +01:00
parent cd5dd35996
commit ec465c85fd
3 changed files with 5 additions and 5 deletions

View File

@ -20,14 +20,14 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#ifdef _MSC_VER
#ifdef _WIN32
#include <intrin.h>
#endif
#include "argon2.h"
static uint64_t rdtsc(void) {
#ifdef _MSC_VER
#ifdef _WIN32
return __rdtsc();
#else
#if defined(__amd64__) || defined(__x86_64__)

View File

@ -21,7 +21,7 @@
#include <stdint.h>
#include <string.h>
#if defined(_MSC_VER)
#ifdef _WIN32
#define BLAKE2_INLINE __inline
#elif defined(__GNUC__) || defined(__clang__)
#define BLAKE2_INLINE __inline__

View File

@ -16,7 +16,7 @@
*/
/*For memory wiping*/
#ifdef _MSC_VER
#ifdef _WIN32
#include <windows.h>
#include <winbase.h> /* For SecureZeroMemory */
#endif
@ -132,7 +132,7 @@ void free_memory(const argon2_context *context, uint8_t *memory,
#endif
void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {
#if defined(_MSC_VER) && VC_GE_2005(_MSC_VER)
#if defined(_MSC_VER) && VC_GE_2005(_MSC_VER) || defined(__MINGW32__)
SecureZeroMemory(v, n);
#elif defined memset_s
memset_s(v, n, 0, n);