diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-02-01 22:19:59 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-02-01 22:30:05 +0200 |
| commit | 12f5028d4957bce3ba176e80527894b497c04a3b (patch) | |
| tree | bfa0500f5c0140b95a22d7c11e1ef3eb9c58a1a4 | |
| parent | d0d256536cdfb1443067fb7cc0a19d647f636a5c (diff) | |
| download | bitcoin-12f5028d4957bce3ba176e80527894b497c04a3b.tar.xz | |
refactor: Move STRINGIZE macro to macros.h
This is a move-only change.
| -rw-r--r-- | src/clientversion.h | 9 | ||||
| -rw-r--r-- | src/util/macros.h | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/clientversion.h b/src/clientversion.h index 2da909f829..0ed3f68094 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -5,6 +5,8 @@ #ifndef BITCOIN_CLIENTVERSION_H #define BITCOIN_CLIENTVERSION_H +#include <util/macros.h> + #if defined(HAVE_CONFIG_H) #include <config/bitcoin-config.h> #endif //HAVE_CONFIG_H @@ -14,13 +16,6 @@ #error Client version information missing: version is not defined by bitcoin-config.h or in any other way #endif -/** - * Converts the parameter X to a string after macro replacement on X has been performed. - * Don't merge these into one macro! - */ -#define STRINGIZE(X) DO_STRINGIZE(X) -#define DO_STRINGIZE(X) #X - //! Copyright string used in Windows .rc files #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL diff --git a/src/util/macros.h b/src/util/macros.h index 36ea87c0fe..0887c80fd7 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -8,4 +8,11 @@ #define PASTE(x, y) x ## y #define PASTE2(x, y) PASTE(x, y) +/** + * Converts the parameter X to a string after macro replacement on X has been performed. + * Don't merge these into one macro! + */ +#define STRINGIZE(X) DO_STRINGIZE(X) +#define DO_STRINGIZE(X) #X + #endif // BITCOIN_UTIL_MACROS_H |