diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-19 16:04:36 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-03-19 16:05:57 +0100 |
| commit | 6324c68aa017ceb48fe3edfb5a2b141fcf0090fa (patch) | |
| tree | 8bc3f781bb5e8e0580a5e179deb6dd54af877d82 /src | |
| parent | 872c921c0a208b04bd0713758e52fcab5b7c1684 (diff) | |
| parent | 8ae413235d4b3f68f0858a3ce2cd65291f9cbe64 (diff) | |
| download | bitcoin-6324c68aa017ceb48fe3edfb5a2b141fcf0090fa.tar.xz | |
Merge #12678: build: Fix a few compilation issues with Clang 7 and -Werror
8ae413235 Remove redundant checks for MSG_* from configure.ac (Vasil Dimov)
71129e026 Do not check for main() in libminiupnpc (Vasil Dimov)
8c632f73c ax_boost_{chrono,unit_test_framework}.m4: take changes from upstream (Vasil Dimov)
Pull request description:
Tree-SHA512: a99ef98c0b94f892eadeda24b3d55c25bedf225b98c6e4178cf6c2d886b44d43e9f75414d0b37db9ac261cec2350666e5e64fab9c104249dd34ff485c51663cb
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 5 | ||||
| -rw-r--r-- | src/netbase.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp index 53a0a9b180..4849e067aa 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -42,12 +42,13 @@ // We add a random period time (0 to 1 seconds) to feeler connections to prevent synchronization. #define FEELER_SLEEP_WINDOW 1 -#if !defined(HAVE_MSG_NOSIGNAL) +// MSG_NOSIGNAL is not available on some platforms, if it doesn't exist define it as 0 +#if !defined(MSG_NOSIGNAL) #define MSG_NOSIGNAL 0 #endif // MSG_DONTWAIT is not available on some platforms, if it doesn't exist define it as 0 -#if !defined(HAVE_MSG_DONTWAIT) +#if !defined(MSG_DONTWAIT) #define MSG_DONTWAIT 0 #endif diff --git a/src/netbase.cpp b/src/netbase.cpp index 3ea3141d5e..92ac1c4c85 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -21,7 +21,7 @@ #include <boost/algorithm/string/case_conv.hpp> // for to_lower() #include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith() -#if !defined(HAVE_MSG_NOSIGNAL) +#if !defined(MSG_NOSIGNAL) #define MSG_NOSIGNAL 0 #endif |