diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -230,6 +230,7 @@ util/bitmanip.h \ util/bytevectorhash.h \ util/check.h \ + util/macros.h \ util/moneystr.h \ util/system.h \ util/threadnames.h \ diff --git a/src/sync.h b/src/sync.h --- a/src/sync.h +++ b/src/sync.h @@ -7,6 +7,7 @@ #define BITCOIN_SYNC_H #include +#include #include #include @@ -173,9 +174,6 @@ using DebugLock = UniqueLock::type>::type>; -#define PASTE(x, y) x##y -#define PASTE2(x, y) PASTE(x, y) - #define LOCK(cs) \ DebugLock PASTE2(criticalblock, \ __COUNTER__)(cs, #cs, __FILE__, __LINE__) diff --git a/src/util/macros.h b/src/util/macros.h new file mode 100644 --- /dev/null +++ b/src/util/macros.h @@ -0,0 +1,11 @@ +// Copyright (c) 2019 The Bitcoin Core developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_UTIL_MACROS_H +#define BITCOIN_UTIL_MACROS_H + +#define PASTE(x, y) x##y +#define PASTE2(x, y) PASTE(x, y) + +#endif // BITCOIN_UTIL_MACROS_H