net: compat.h related cleanup
ClosedPublic
Actions

Authored by PiRK on Feb 4 2022, 16:34.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCca2f8da4cbed: net: compat.h related cleanup

Summary

net: Drop unneeded Windows headers in compat.h

No interface from the mswsock.h header is used.
According to https://docs.microsoft.com/en-us/windows/win32/winsock/creating-a-basic-winsock-application
"The Winsock2.h header file internally includes core elements from
the Windows.h header file, so there is not usually an #include line
for the Windows.h header file in Winsock applications."

net: Drop unneeded headers when compat.h included

net: Add compat.h header for htonl function

This is a backport of core#20221

Test Plan

ninja all check-all

Run windows builds on CI.

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Feb 4 2022, 16:34

Herald added a reviewer: Restricted Project. · View Herald TranscriptFeb 4 2022, 16:34

PiRK requested review of this revision.Feb 4 2022, 16:34

teamcity edited the summary of this revision. (Show Details)Feb 4 2022, 16:34

Harbormaster completed remote builds in B18164: Diff 32220.Feb 4 2022, 16:52

@bot build-win64 gitian-win

teamcity awarded a token.Feb 5 2022, 08:42

The test plan is unrelated to the change.
This is a recurring pattern, please pay more attention to your test plans.

This revision now requires changes to proceed.Feb 5 2022, 08:43

Build Bitcoin ABC Diffs / Diff Testing (build-win64) failed.

Tail of the build log:

[739/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/recentrequeststablemodel.cpp.obj
[740/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondescdialog.cpp.obj
[741/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsentry.cpp.obj
[742/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/receivecoinsdialog.cpp.obj
[743/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/rpcconsole.cpp.obj
[744/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentserver.cpp.obj
[745/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionrecord.cpp.obj
[746/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/signverifymessagedialog.cpp.obj
[747/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodeltransaction.cpp.obj
[748/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiondesc.cpp.obj
[749/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactionview.cpp.obj
[750/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletframe.cpp.obj
[751/785] Linking CXX executable src/bench/bitcoin-bench.exe
[752/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/transactiontablemodel.cpp.obj
[753/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/sendcoinsdialog.cpp.obj
[754/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/paymentrequestplus.cpp.obj
[755/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletcontroller.cpp.obj
[756/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletview.cpp.obj
[757/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt-base.dir/walletmodel.cpp.obj
[758/785] Linking CXX static library src/qt/libbitcoin-qt-base.a
[759/785] Automatic MOC for target bitcoin-qt
[760/785] Creating version file for bitcoin-qt
[761/785] 
[762/785] Building RC object src/qt/CMakeFiles/bitcoin-qt.dir/bitcoin-qt.rc.res
/work/abc-ci-builds/build-win64/src/qt/bitcoin-qt.rc:27: use "" to put " in a string
/work/abc-ci-builds/build-win64/src/qt/bitcoin-qt.rc:27: use "" to put " in a string
[763/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt.dir/bitcoin-qt_autogen/mocs_compilation.cpp.obj
[764/785] Automatic MOC for target test_bitcoin-qt
[765/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/util.cpp.obj
[766/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/compattests.cpp.obj
[767/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/bitcoinaddressvalidatortests.cpp.obj
[768/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_bitcoin-qt_autogen/mocs_compilation.cpp.obj
[769/785] Building CXX object src/qt/CMakeFiles/bitcoin-qt.dir/main.cpp.obj
[770/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/guiutiltests.cpp.obj
[771/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/uritests.cpp.obj
[772/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/test_main.cpp.obj
[773/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/apptests.cpp.obj
[774/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/paymentservertests.cpp.obj
[775/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/__/__/wallet/test/wallet_test_fixture.cpp.obj
[776/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/rpcnestedtests.cpp.obj
[777/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/addressbooktests.cpp.obj
[778/785] Building CXX object src/qt/test/CMakeFiles/test_bitcoin-qt.dir/wallettests.cpp.obj
[779/785] Linking CXX executable src/qt/bitcoin-qt.exe
[779/785] Install the project...
-- Install configuration: "RelWithDebInfo"
-- Installing: /results/artifacts/lib/libbitcoinconsensus.dll.a
-- Installing: /results/artifacts/bin/libbitcoinconsensus.dll
-- Installing: /results/artifacts/include/bitcoinconsensus.h
-- Installing: /results/artifacts/bin/bitcoin-wallet.exe
-- Installing: /results/artifacts/bin/bitcoin-cli.exe
-- Installing: /results/artifacts/bin/bitcoin-tx.exe
-- Installing: /results/artifacts/bin/bitcoind.exe
-- Installing: /results/artifacts/bin/bitcoin-qt.exe
[781/785] Linking CXX executable src/qt/test/test_bitcoin-qt.exe
[782/785] Installing component bitcoin-qt-test_bitcoin-qt
-- Install configuration: "RelWithDebInfo"
-- Install component: "bitcoin-qt-test_bitcoin-qt"
-- Installing: /results/artifacts/bin/test_bitcoin-qt.exe
ninja: build stopped: cannot make progress due to previous errors.
Build build-win64 failed with exit code 1