aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-11-20 16:14:44 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-20 16:18:33 +0100
commitd980f9b7d687a1e60eecf3691b592d9806a30f4a (patch)
treea4b9a53926588a9f4193df06ae742f6c48e8fdf7
parent96aaf006a5dcb67f1b4f26a60b214a18572e3d87 (diff)
parent379778bde61f8589988cf113ec4c3961b8155b0a (diff)
downloadbitcoin-d980f9b7d687a1e60eecf3691b592d9806a30f4a.tar.xz
Merge pull request #3257
379778b core: remove includes in .cpp, if header is already in .h (Philip Kaufmann)
-rw-r--r--src/bitcoinrpc.cpp2
-rw-r--r--src/core.cpp2
-rw-r--r--src/main.cpp1
-rw-r--r--src/miner.cpp2
-rw-r--r--src/net.cpp3
-rw-r--r--src/netbase.cpp2
-rw-r--r--src/protocol.cpp2
-rw-r--r--src/script.cpp2
-rw-r--r--src/util.cpp2
-rw-r--r--src/wallet.cpp1
-rw-r--r--src/walletdb.cpp1
11 files changed, 0 insertions, 20 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index c715f13fd2..9d45779b2c 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -11,8 +11,6 @@
#include "util.h"
#include "wallet.h"
-#include <stdint.h>
-
#include <boost/algorithm/string.hpp>
#include <boost/asio.hpp>
#include <boost/asio/ssl.hpp>
diff --git a/src/core.cpp b/src/core.cpp
index 80cdcb0849..7a1c90e587 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -7,8 +7,6 @@
#include "util.h"
-#include <stdint.h>
-
std::string COutPoint::ToString() const
{
return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10).c_str(), n);
diff --git a/src/main.cpp b/src/main.cpp
index 15fc8a24c3..c4d58f970d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,6 @@
#include <inttypes.h>
#include <sstream>
-#include <stdint.h>
#include <boost/algorithm/string/replace.hpp>
#include <boost/filesystem.hpp>
diff --git a/src/miner.cpp b/src/miner.cpp
index 397c95c624..97f434851d 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -10,8 +10,6 @@
#include "net.h"
#include "wallet.h"
-#include <stdint.h>
-
double dHashesPerSec = 0.0;
int64_t nHPSTimerStart = 0;
diff --git a/src/net.cpp b/src/net.cpp
index 59982b4066..c547cf3337 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -15,9 +15,6 @@
#include "db.h"
#include "ui_interface.h"
-#include <inttypes.h>
-#include <stdint.h>
-
#ifdef WIN32
#include <string.h>
#else
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 1392fa8233..37e1df9138 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -10,8 +10,6 @@
#include "uint256.h"
#include "util.h"
-#include <stdint.h>
-
#ifndef WIN32
#include <fcntl.h>
#endif
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 798227581e..be835507ab 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -7,8 +7,6 @@
#include "util.h"
-#include <stdint.h>
-
#ifndef WIN32
# include <arpa/inet.h>
#endif
diff --git a/src/script.cpp b/src/script.cpp
index 228d432ee3..2b66bc73d6 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -14,8 +14,6 @@
#include "uint256.h"
#include "util.h"
-#include <stdint.h>
-
#include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/tuple/tuple_comparison.hpp>
diff --git a/src/util.cpp b/src/util.cpp
index 44186b7325..65940758a1 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -12,9 +12,7 @@
#include "uint256.h"
#include "version.h"
-#include <inttypes.h>
#include <stdarg.h>
-#include <stdint.h>
#ifndef WIN32
// for posix_fallocate
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 31dfe18185..db957cbd05 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -10,7 +10,6 @@
#include "net.h"
#include <inttypes.h>
-#include <stdint.h>
#include <boost/algorithm/string/replace.hpp>
#include <openssl/rand.h>
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index 6b3628b184..2dc6594e93 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -12,7 +12,6 @@
#include "wallet.h"
#include <inttypes.h>
-#include <stdint.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>