diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-05-17 12:25:09 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-17 12:26:02 -0400 |
| commit | 1b53e4f67c6dbefadbfda7e40948840fe2b9da48 (patch) | |
| tree | b7a2ebdfe39428f0066f862da35f235930062d62 | |
| parent | ef0e5cd5174c1533bdb23787bffb9247f4abe381 (diff) | |
| parent | 84f41946b9026e8bf7bc44ed848dfb945394b693 (diff) | |
| download | bitcoin-1b53e4f67c6dbefadbfda7e40948840fe2b9da48.tar.xz | |
Merge #13236: break circular dependency: random/sync -> util -> random/sync
84f41946b9 break circular dependency: random/sync -> util -> random/sync (Chun Kuan Lee)
Pull request description:
LogPrintf has acutally been moved to logging.h
Tree-SHA512: a7135f5fea421e62f010f2e434873bd1c1738f115453377dada7d24900b3b095535d8aa0462c3acffdacf2f4e819e05ad39b13f2de5a36ac8f7b8467c639a0db
| -rw-r--r-- | src/random.cpp | 5 | ||||
| -rw-r--r-- | src/sync.cpp | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/random.cpp b/src/random.cpp index 4ba86e4e7a..491272d5f3 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -11,14 +11,15 @@ #include <compat.h> // for Windows API #include <wincrypt.h> #endif -#include <util.h> // for LogPrint() -#include <utilstrencodings.h> // for GetTime() +#include <logging.h> // for LogPrint() +#include <utiltime.h> // for GetTime() #include <stdlib.h> #include <chrono> #include <thread> #ifndef WIN32 +#include <fcntl.h> #include <sys/time.h> #endif diff --git a/src/sync.cpp b/src/sync.cpp index 6f21d498ee..1f27aeb40b 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -4,13 +4,15 @@ #include <sync.h> -#include <memory> -#include <set> -#include <util.h> +#include <logging.h> #include <utilstrencodings.h> #include <stdio.h> +#include <map> +#include <memory> +#include <set> + #ifdef DEBUG_LOCKCONTENTION #if !defined(HAVE_THREAD_LOCAL) static_assert(false, "thread_local is not supported"); |