summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2016-07-23 16:17:44 +0100
committer smf- <smf-@users.noreply.github.com>2016-07-23 16:18:34 +0100
commit4423c242a693c37fbb4edc50f17c02cdf98abd88 (patch)
tree7731f951ce38e0fd3290583dd707aee2b124d49d
parenta2189e47d4c1c5d49dd77d9e7946f38c5373e353 (diff)
fix building with gcc 6.1.0 by making it consistent with other source files. (nw)
-rw-r--r--src/tools/chdman.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/tools/chdman.cpp b/src/tools/chdman.cpp
index 86b406a4393..3bc363a628c 100644
--- a/src/tools/chdman.cpp
+++ b/src/tools/chdman.cpp
@@ -36,11 +36,8 @@
//**************************************************************************
// CONSTANTS & DEFINES
//**************************************************************************
-/* MINGW has adopted the MSVC formatting for 64-bit ints as of gcc 4.4 */
-#if defined(WIN32)
+#if defined(_MSC_VER)
#define I64FMT "I64"
-#elif !defined(__APPLE__) && defined(__LP64__)
-#define I64FMT "l"
#else
#define I64FMT "ll"
#endif
@@ -1738,7 +1735,7 @@ static void do_create_hd(parameters_t &params)
auto size_str = params.find(OPTION_SIZE);
if (size_str != params.end())
{
- if (sscanf(size_str->second->c_str(), "%" I64FMT"d", &filesize) != 1)
+ if (sscanf(size_str->second->c_str(), "%" I64FMT "d", &filesize) != 1)
report_error(1, "Invalid size string");
}
}