Merge pull request #739 from grspy/master

Fix 32-bit time_t compilation error on WIN64
This commit is contained in:
Iceman authored and GitHub committed 2020-05-19 20:47:49 +02:00
commit 6a87bdd44e
2 files changed
+5 -3

No files matched your search

+2 -2
View File
@@ -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"