From 8509d233d230c83efb39da2ba4d1daeab2e0d8b9 Mon Sep 17 00:00:00 2001 From: grspy Date: Tue, 19 May 2020 20:49:25 +0300 Subject: [PATCH] Fix 32-bit time_t compilation error on WIN64 --- client/src/cmdhw.c | 4 ++-- tools/mf_nonce_brute/mf_nonce_brute.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhw.c b/client/src/cmdhw.c index cb48188a0..3b452b492 100644 --- a/client/src/cmdhw.c +++ b/client/src/cmdhw.c @@ -661,10 +661,10 @@ void pm3_version(bool verbose, bool oneliner) { # define PM3HOSTOS " OS:OpenBSD" #elif defined(__CYGWIN__) # define PM3HOSTOS " OS:Cygwin" -#elif defined(_WIN64) | defined(__WIN64__) +#elif defined(_WIN64) || defined(__WIN64__) // must be tested before _WIN32 # define PM3HOSTOS " OS:Windows (64b)" -#elif defined(_WIN32) | defined(__WIN32__) +#elif defined(_WIN32) || defined(__WIN32__) # define PM3HOSTOS " OS:Windows (32b)" #else # define PM3HOSTOS " OS:unknown" diff --git a/tools/mf_nonce_brute/mf_nonce_brute.c b/tools/mf_nonce_brute/mf_nonce_brute.c index 6bc69c3d9..3aaa5a9f3 100644 --- a/tools/mf_nonce_brute/mf_nonce_brute.c +++ b/tools/mf_nonce_brute/mf_nonce_brute.c @@ -1,5 +1,7 @@ #define __STDC_FORMAT_MACROS -#define _USE_32BIT_TIME_T 1 +#if !defined(_WIN64) +# define _USE_32BIT_TIME_T 1 +#endif #include #include #include