Merge pull request #3729

d5f1e72 Don't use PRIx64 formatting derives from inttypes.h (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-02-23 09:03:32 +01:00
commit 4fd082ded7
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
9 changed files with 19 additions and 19 deletions

View File

@ -11,7 +11,6 @@
#include "util.h"
#include <algorithm>
#include <inttypes.h>
#include <map>
#include <boost/algorithm/string/classification.hpp>

View File

@ -10,7 +10,6 @@
#include "protocol.h"
#include "util.h"
#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32

View File

@ -24,7 +24,6 @@
#include "walletdb.h"
#endif
#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32

View File

@ -17,7 +17,6 @@
#include "ui_interface.h"
#include "util.h"
#include <inttypes.h>
#include <sstream>
#include <boost/algorithm/string/replace.hpp>

View File

@ -18,7 +18,6 @@
#include "util.h"
#include <deque>
#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32

View File

@ -15,8 +15,6 @@
#include "wallet.h" // for getinfo
#endif
#include <inttypes.h>
#include <boost/foreach.hpp>
#include "json/json_spirit_value.h"

View File

@ -16,7 +16,6 @@
#include <cstdio>
#include <exception>
#include <inttypes.h>
#include <map>
#include <stdarg.h>
#include <stdint.h>
@ -45,13 +44,25 @@ static const int64_t CENT = 1000000;
#define UEND(a) ((unsigned char*)&((&(a))[1]))
#define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0]))
/* Format characters for (s)size_t and ptrdiff_t (C99 standard) */
#define PRIszx "zx"
#define PRIszu "zu"
#define PRIszd "zd"
#define PRIpdx "tx"
#define PRIpdu "tu"
#define PRIpdd "td"
/* Format characters for (s)size_t, ptrdiff_t, uint64_t.
*
* As the tinyformat-based formatting system is type-safe, no special format
* characters are really needed to specify sizes. Tinyformat can support
* (ignores) the C99 prefixes such as "ll" but chokes on MSVC's inttypes
* defines prefixes such as "I64X". So don't include inttypes.h and define our
* own for compatibility.
* If you get a warning here about a redefine of PRI?64, make sure that
* inttypes.h is not included.
*/
#define PRIszx "x"
#define PRIszu "u"
#define PRIszd "d"
#define PRIpdx "x"
#define PRIpdu "u"
#define PRIpdd "d"
#define PRIx64 "x"
#define PRIu64 "u"
#define PRId64 "d"
// This is needed because the foreach macro can't get over the comma in pair<t1, t2>
#define PAIRTYPE(t1, t2) std::pair<t1, t2>

View File

@ -9,8 +9,6 @@
#include "coincontrol.h"
#include "net.h"
#include <inttypes.h>
#include <boost/algorithm/string/replace.hpp>
#include <openssl/rand.h>

View File

@ -11,8 +11,6 @@
#include "sync.h"
#include "wallet.h"
#include <inttypes.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>