Mercurial > hg > bitcoin
changeset 3368:6c276e1ce65f draft
Allow building with IPv6 support, but it disabled by default
| author | Luke Dashjr <luke-jr+git@utopios.org> |
|---|---|
| date | Fri, 08 Jun 2012 16:43:06 +0000 |
| parents | 643b5aa38a14 |
| children | 8c9ff2ea3bbd 10d39e57398c |
| files | bitcoin-qt.pro src/init.cpp src/makefile.linux-mingw src/makefile.mingw src/makefile.osx src/makefile.unix |
| diffstat | 6 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -71,12 +71,16 @@ DEFINES += FIRST_CLASS_MESSAGING } -# use: qmake "USE_IPV6=1" (enabled; default) +# use: qmake "USE_IPV6=1" ( enabled by default; default) +# or: qmake "USE_IPV6=0" (disabled by default) # or: qmake "USE_IPV6=-" (not supported) contains(USE_IPV6, -) { message(Building without IPv6 support) } else { - DEFINES += USE_IPV6 + count(USE_IPV6, 0) { + USE_IPV6=1 + } + DEFINES += USE_IPV6=$$USE_IPV6 } contains(BITCOIN_NEED_QT_PLUGINS, 1) {
--- a/src/init.cpp +++ b/src/init.cpp @@ -500,6 +500,12 @@ SetLimited(net); } } +#if defined(USE_IPV6) +#if ! USE_IPV6 + else + SetLimited(NET_IPV6); +#endif +#endif CService addrProxy; bool fProxy = false;
--- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -45,7 +45,7 @@ endif ifneq (${USE_IPV6}, -) - DEFS += -DUSE_IPV6 + DEFS += -DUSE_IPV6=$(USE_IPV6) endif LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
--- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -41,7 +41,7 @@ endif ifneq (${USE_IPV6}, -) - DEFS += -DUSE_IPV6 + DEFS += -DUSE_IPV6=$(USE_IPV6) endif LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi