Fix Windows build errors introduced in #10498 #12416

pull practicalswift wants to merge 1 commits into bitcoin:master from practicalswift:fix-windows-build changing 2 files +2 −2

practicalswift commented at 2:51 PM on February 12, 2018: contributor

Fix Windows build errors introduced in #10498

Fixes #12386

cc @ken2812221, @Sjors, @MarcoFalke and @floreslorca
Fix Windows build errors introduced in #10498
Fixes #12386
f40df29d96
laanwj added the label Refactoring on Feb 12, 2018
laanwj added the label Windows on Feb 12, 2018
MarcoFalke commented at 5:54 PM on February 12, 2018: member

utACK f40df29d96a29197f9949b63da80f9ba3152fc79

Sjors commented at 6:02 PM on February 12, 2018: member

Tested on a Gitian VM:

cd bitcoin
git remote add practicalswift https://github.com/practicalswift/bitcoin
git fetch practicalswift
cd ..
./gitian-build.sh -u https://github.com/practicalswift/bitcoin --detach-sign -c -b -o w sjors fix-windows-build
fix-windows-build

Build succeeds, but I do see some warnings (not sure if related), e.g.:

In file included from /home/ubuntu/build/bitcoin/depends/i686-w64-mingw32/share/../include/boost/thread/win32/condition_variable.hpp:9:0,
                 from /home/ubuntu/build/bitcoin/depends/i686-w64-mingw32/share/../include/boost/thread/condition_variable.hpp:14,
                 from ./util.h:31,
                 from ./addrman.h:14,
                 from init.cpp:12:
/home/ubuntu/build/bitcoin/depends/i686-w64-mingw32/share/../include/boost/thread/win32/thread_primitives.hpp:177:55: warning: conflicts with previous declaration ‘void* boost::detail::win32::GetModuleHandleA(const char*)’ [enabled by default]
                 __declspec(dllimport) void* __stdcall GetModuleHandleA(char const*);

I copied the executables over to a Windows 10 VM and was able to launch QT.

MarcoFalke deleted a comment on Feb 12, 2018
MarcoFalke merged this on Feb 12, 2018
MarcoFalke closed this on Feb 12, 2018
MarcoFalke referenced this in commit c997f88082 on Feb 12, 2018
MarcoFalke added the label GUI on Feb 12, 2018
MarcoFalke removed the label Refactoring on Feb 12, 2018
PastaPastaPasta referenced this in commit a09681c84f on Jun 10, 2020
PastaPastaPasta referenced this in commit c7ef89ec3a on Jun 11, 2020
PastaPastaPasta referenced this in commit a6c210a755 on Jun 11, 2020
PastaPastaPasta referenced this in commit e4f13ff508 on Jun 11, 2020
PastaPastaPasta referenced this in commit b8bb2a7ab5 on Jun 12, 2020
practicalswift deleted the branch on Apr 10, 2021
DrahtBot locked this on Aug 18, 2022

Contributors

Labels

Linked (view graph)

#10498 Use static_cast instead of C-style casts for non-fundamental types #12386 Windows Build Error