dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #739 from grspy/master

Browse Source 
Fix 32-bit time_t compilation error on WIN64
This commit is contained in:
Iceman
2020-05-19 20:47:49 +02:00
committed by GitHub
parent 0c248f76ad 8509d233d2
commit 6a87bdd44e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/cmdhw.c
View File

@@ -661,10 +661,10 @@ void pm3_version(bool verbose, bool oneliner) {
# define PM3HOSTOS " OS:OpenBSD" # define PM3HOSTOS " OS:OpenBSD"
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
# define PM3HOSTOS " OS:Cygwin" # define PM3HOSTOS " OS:Cygwin"
#elif defined(_WIN64) | defined(__WIN64__) #elif defined(_WIN64) || defined(__WIN64__)
// must be tested before _WIN32 // must be tested before _WIN32
# define PM3HOSTOS " OS:Windows (64b)" # define PM3HOSTOS " OS:Windows (64b)"
#elif defined(_WIN32) | defined(__WIN32__) #elif defined(_WIN32) || defined(__WIN32__)
# define PM3HOSTOS " OS:Windows (32b)" # define PM3HOSTOS " OS:Windows (32b)"
#else #else
# define PM3HOSTOS " OS:unknown" # define PM3HOSTOS " OS:unknown"

4
tools/mf_nonce_brute/mf_nonce_brute.c
View File

@@ -1,5 +1,7 @@
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#define _USE_32BIT_TIME_T 1 #if !defined(_WIN64)
# define _USE_32BIT_TIME_T 1
#endif
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>