From: MASM fan <masmfan@gmail.com>
Date: Thu, 1 Jan 2015 21:07:14 +0000 (-0800)
Subject: Fix forced %llx issue with MinGW, remove unnecessary condition
X-Git-Tag: nvc-v0.5.1~34
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=6c1f5a822a9ee7335ae9888f5bc81d9586fac2a7

Fix forced %llx issue with MinGW, remove unnecessary condition

* MinGW replaces %I64 with %llx which could cause compilation warnings;
* We already using src/ as includes directory so no need for additional conditions.
---

diff --git a/src/serialize.h b/src/serialize.h
index 1a9eaf7..31a2883 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -21,16 +21,15 @@
 #include <boost/tuple/tuple_io.hpp>
 #endif
 
+#if defined __USE_MINGW_ANSI_STDIO
+#undef __USE_MINGW_ANSI_STDIO // This constant forces MinGW to conduct stupid behavior
+#endif
+#include <inttypes.h>
+
 #include "allocators.h"
 #include "version.h"
 
 
-#if !defined(_MSC_VER) || _MSC_VER > 1700
-#include <inttypes.h>
-#else
-#include "inttypes.h"
-#endif
-
 class CScript;
 class CDataStream;
 class CAutoFile;
diff --git a/src/util.h b/src/util.h
index 410debe..77b439e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -5,11 +5,6 @@
 #ifndef BITCOIN_UTIL_H
 #define BITCOIN_UTIL_H
 
-#if !defined(_MSC_VER) || _MSC_VER > 1700
-#include <inttypes.h>
-#else
-#include "inttypes.h"
-#endif
 
 #include "uint256.h"
 
@@ -33,6 +28,11 @@
 
 #include <stdarg.h>
 
+#if defined(__USE_MINGW_ANSI_STDIO)
+#undef __USE_MINGW_ANSI_STDIO // This constant forces MinGW to conduct stupid behavior
+#endif
+#include <inttypes.h>
+
 #include "netbase.h" // for AddTimeData