sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #15782: Avoid redefine warning

Browse Source 
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
This commit is contained in:
Wladimir J. van der Laan 2019-04-11 15:31:34 +02:00 committed by pasta
parent af79508f7e
commit bb0c4dbb23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs.cpp
View File

@ -6,7 +6,9 @@
#include <sys/file.h> #include <sys/file.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#else #else
#ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif
#include <codecvt> #include <codecvt>
#include <windows.h> #include <windows.h>
#endif #endif