Skip to content

Commit f2cc718

Browse files
committed
Merge bitcoin/bitcoin#28798: build: Drop no longer needed MSVC warning suppressions
33223f9 build: Drop no longer needed MSVC warning suppressions (Hennadii Stepanov) Pull request description: ACKs for top commit: maflcko: lgtm ACK 33223f9 Tree-SHA512: 3757fce0a6900f6edc50a1b1298c5448059b100060e8a200bfc12d034852138084db12d100caefd2a19f170faa22bf4be9050094fd64f1273312541df7c81ef4
2 parents 953d302 + 33223f9 commit f2cc718

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

build_msvc/bitcoin-qt/bitcoin-qt.vcxproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Link>
5959
<SubSystem>Windows</SubSystem>
6060
<AdditionalDependencies>$(QtReleaseLibraries);%(AdditionalDependencies)</AdditionalDependencies>
61-
<AdditionalOptions>/ignore:4206 /LTCG:OFF</AdditionalOptions>
61+
<AdditionalOptions>/LTCG:OFF</AdditionalOptions>
6262
</Link>
6363
<ResourceCompile>
6464
<AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories>
@@ -72,7 +72,6 @@
7272
</ClCompile>
7373
<Link>
7474
<AdditionalDependencies>$(QtDebugLibraries);%(AdditionalDependencies)</AdditionalDependencies>
75-
<AdditionalOptions>/ignore:4206</AdditionalOptions>
7675
</Link>
7776
<ResourceCompile>
7877
<AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories>

build_msvc/common.init.vcxproj.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,14 @@
9090
<AdditionalOptions>/utf-8 /Zc:__cplusplus /std:c++20 %(AdditionalOptions)</AdditionalOptions>
9191
<DisableSpecificWarnings>4018;4244;4267;4715;4805</DisableSpecificWarnings>
9292
<TreatWarningAsError>true</TreatWarningAsError>
93-
<PreprocessorDefinitions>_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SECP256K1_STATIC;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SECP256K1_STATIC;ZMQ_STATIC;NOMINMAX;WIN32;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CONSOLE;_WIN32_WINNT=0x0601;_WIN32_IE=0x0501;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<AdditionalIncludeDirectories>..\..\src;..\..\src\minisketch\include;..\..\src\univalue\include;..\..\src\secp256k1\include;..\..\src\leveldb\include;..\..\src\leveldb\helpers\memenv;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9595
</ClCompile>
9696
<Link>
9797
<SubSystem>Console</SubSystem>
9898
<AdditionalDependencies>Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
9999
<RandomizedBaseAddress>true</RandomizedBaseAddress>
100100
</Link>
101-
<Lib>
102-
<AdditionalOptions>/ignore:4221</AdditionalOptions>
103-
</Lib>
104101
</ItemDefinitionGroup>
105102
<Import Project="common.init.vcxproj.user" Condition="Exists('common.init.vcxproj.user')" />
106103
</Project>

build_msvc/libminisketch/libminisketch.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</ItemGroup>
2929
<ItemDefinitionGroup>
3030
<ClCompile>
31-
<DisableSpecificWarnings>4060;4065;4146;4244;4267;4554</DisableSpecificWarnings>
31+
<DisableSpecificWarnings>4060;4065;4146;4244;4267</DisableSpecificWarnings>
3232
<PreprocessorDefinitions>HAVE_CLMUL;DISABLE_DEFAULT_FIELDS;ENABLE_FIELD_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3333
</ClCompile>
3434
</ItemDefinitionGroup>

build_msvc/libsecp256k1/libsecp256k1.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PreprocessorDefinitions>ENABLE_MODULE_RECOVERY;ENABLE_MODULE_EXTRAKEYS;ENABLE_MODULE_SCHNORRSIG;ENABLE_MODULE_ELLSWIFT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1818
<UndefinePreprocessorDefinitions>USE_ASM_X86_64;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
1919
<AdditionalIncludeDirectories>..\..\src\secp256k1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
20-
<DisableSpecificWarnings>4146;4244;4267;4334</DisableSpecificWarnings>
20+
<DisableSpecificWarnings>4146;4244;4267</DisableSpecificWarnings>
2121
</ClCompile>
2222
</ItemDefinitionGroup>
2323
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</ClCompile>
8383
<Link>
8484
<AdditionalDependencies>$(QtLibraryDir)\Qt5Test.lib;$(QtReleaseLibraries);%(AdditionalDependencies)</AdditionalDependencies>
85-
<AdditionalOptions>/ignore:4206 /LTCG:OFF</AdditionalOptions>
85+
<AdditionalOptions>/LTCG:OFF</AdditionalOptions>
8686
</Link>
8787
</ItemDefinitionGroup>
8888

@@ -92,7 +92,6 @@
9292
</ClCompile>
9393
<Link>
9494
<AdditionalDependencies>$(QtDebugLibraries);%(AdditionalDependencies)</AdditionalDependencies>
95-
<AdditionalOptions>/ignore:4206</AdditionalOptions>
9695
</Link>
9796
</ItemDefinitionGroup>
9897
<ItemGroup>

0 commit comments

Comments
 (0)