summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-03-15 04:29:58 +1100
committer Vas Crabb <cuavas@users.noreply.github.com>2016-03-15 04:29:58 +1100
commit0e48eb2a4392df8dd020f42432d90f614d73c6b3 (patch)
treed1e6a5a687a7844d064f045ce0de15866ffac532
parent92357bdff202c8effe167fe389accd1ccdec1777 (diff)
parent7a3a46e477236d70df252058f3646180ca58a862 (diff)
Merge pull request #719 from bmunger/master
Fix I64FMT in chdman for Linux 64 bit
-rw-r--r--src/tools/chdman.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp
index 6029f481e07..edf7ee0b14a 100644
--- a/src/tools/chdman.cpp
+++ b/src/tools/chdman.cpp
@@ -34,8 +34,10 @@
// CONSTANTS & DEFINES
//**************************************************************************
/* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 */
-#if defined(__MINGW32__) || defined(_MSC_VER)
+#if defined(WIN32)
#define I64FMT "I64"
+#elif !defined(__APPLE__) && defined(__LP64__)
+#define I64FMT "l"
#else
#define I64FMT "ll"
#endif