diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-11 15:31:34 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-04-11 15:57:13 +0200 |
| commit | 570eb7b130c2e984a54ee17477f19269d79023b0 (patch) | |
| tree | b72747551d316323d0d87ceb8e94cf73eea53649 /src | |
| parent | c536dfbcb00fb15963bf5d507b7017c241718bf6 (diff) | |
| parent | 0b3a65455a20504a66355ae2e6f0a83cb8462f3c (diff) | |
| download | bitcoin-570eb7b130c2e984a54ee17477f19269d79023b0.tar.xz | |
Merge #15782: Avoid redefine warning
0b3a65455a20504a66355ae2e6f0a83cb8462f3c Avoid redefine warning (Peter Bushnell)
Pull request description:
Wrap preprocessor definition of NOMINMAX in ifndef conditional to suppress warning when cross compiling Windows.
`fs.cpp:6:0: warning: "NOMINMAX" redefined`
`/usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/include/c++/x86_64-w64-mingw32/bits/os_defines.h:45:0: note: this is the location of the previous definition
#define NOMINMAX 1`
#define NOMINMAX was introduced in the following merge.
https://github.com/bitcoin/bitcoin/pull/14426
ACKs for commit 0b3a65:
practicalswift:
utACK 0b3a65455a20504a66355ae2e6f0a83cb8462f3c
promag:
utACK 0b3a654.
Tree-SHA512: 0175195b88e63d3d44ffac2b8cc87ae7b285a45ed4e49605bca0cc82db073006c22024ef9c2f287980d357dac1099f798f1eeaa0bd75bb7a625919dc1632366c
Diffstat (limited to 'src')
| -rw-r--r-- | src/fs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fs.cpp b/src/fs.cpp index f937f64e04..7b422b8d70 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -3,7 +3,9 @@ #ifndef WIN32 #include <fcntl.h> #else +#ifndef NOMINMAX #define NOMINMAX +#endif #include <codecvt> #include <windows.h> #endif |