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

Merge bitcoin/bitcoin#30491: Fix MSVC warning C4273 "inconsistent dll linkage"

Browse Source 
7703884ab19cd7ffddc5c52ba57dec82fbc8dc2b Fix MSVC warning C4273 "inconsistent dll linkage" (Hennadii Stepanov)

Pull request description:

  Broken out of https://github.com/bitcoin/bitcoin/pull/30454.

  When using CMake, the user can select the MSVC runtime library to be:
  1) Statically-linked (with the corresponding `x64-windows-static` vcpkg triplet) or
  2) Dynamically-linked (with the corresponding `x64-windows` vcpkg triplet)

  In the latter case, the compiler emits the [C4273](https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-1-c4273) warning.

  As the "Necessary on some platforms" comment does not apply to MSVC, skip the declaration for MSVC.

  The MSVC build system in the master branch supports the statically-linked runtime only: ed739d14b5/build_msvc/common.init.vcxproj.in (L65)

ACKs for top commit:
  sipa:
    utACK 7703884ab19cd7ffddc5c52ba57dec82fbc8dc2b
  sipsorcery:
    utACK 7703884ab19cd7ffddc5c52ba57dec82fbc8dc2b.
  theuni:
    utACK 7703884ab19cd7ffddc5c52ba57dec82fbc8dc2b

Tree-SHA512: a42e1a0d48973217462e703c418f3e9ef9cb5236267c1bf32912aacaf68976cdd2b9229168523f7c2a99ee3f2fb1bf8add4f342796bdb1e4063ca026b761db51
This commit is contained in:
merge-script 2024-07-20 14:50:09 +01:00 committed by pasta
parent 5ba1309b71
commit 4f44750f9a
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/randomenv.cpp
View File

@ -57,8 +57,10 @@
#include <sys/auxv.h> #include <sys/auxv.h>
#endif #endif
#ifndef _MSC_VER
//! Necessary on some platforms //! Necessary on some platforms
extern char** environ; extern char** environ; // NOLINT(readability-redundant-declaration): Necessary on some platforms
#endif
namespace { namespace {