diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2022-03-30 08:19:02 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2022-03-30 08:19:09 +0200 |
| commit | f4fba578294de9fa83e828a91bbccde264109f62 (patch) | |
| tree | a0c60971d74b66c21cff1c5d1068fe009974d70f /src | |
| parent | f089a0802c34302041cbcbb40508020a57ea1298 (diff) | |
| parent | d4ba2b2cbc3d1ef381fbdbae88cb5b18ca53f678 (diff) | |
| download | bitcoin-f4fba578294de9fa83e828a91bbccde264109f62.tar.xz | |
Merge bitcoin/bitcoin#24704: compat: remove strnlen back-compat code
d4ba2b2cbc3d1ef381fbdbae88cb5b18ca53f678 compat: remove strnlen back-compat code (fanquake)
Pull request description:
This was needed for mingw (not mingw-w64), and some older versions of
macOS, which we no-longer support.
ACKs for top commit:
hebasto:
ACK d4ba2b2cbc3d1ef381fbdbae88cb5b18ca53f678
Tree-SHA512: d1beb9df58464feea3076091361d7d46e4a8901e347644a5fa6f24e052ca24ee0c7c0dd3f2a3d682b0204bf50430fa89eac62121691ea08af6dcf6b907bdec87
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/compat.h | 4 | ||||
| -rw-r--r-- | src/compat/strnlen.cpp | 18 |
3 files changed, 0 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index af6bcaf4d7..d3ae9a8d8c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -606,7 +606,6 @@ libbitcoin_util_a_SOURCES = \ chainparamsbase.cpp \ clientversion.cpp \ compat/glibcxx_sanity.cpp \ - compat/strnlen.cpp \ fs.cpp \ interfaces/echo.cpp \ interfaces/handler.cpp \ diff --git a/src/compat.h b/src/compat.h index 237b881b11..3ec4ab53fd 100644 --- a/src/compat.h +++ b/src/compat.h @@ -80,10 +80,6 @@ typedef int32_t ssize_t; #endif #endif -#if HAVE_DECL_STRNLEN == 0 -size_t strnlen( const char *start, size_t max_len); -#endif // HAVE_DECL_STRNLEN - #ifndef WIN32 typedef void* sockopt_arg_type; #else diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp deleted file mode 100644 index 93a034a664..0000000000 --- a/src/compat/strnlen.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2009-2018 The Bitcoin Core developers -// Distributed under the MIT software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#if defined(HAVE_CONFIG_H) -#include <config/bitcoin-config.h> -#endif - -#include <cstring> - -#if HAVE_DECL_STRNLEN == 0 -size_t strnlen( const char *start, size_t max_len) -{ - const char *end = (const char *)memchr(start, '\0', max_len); - - return end ? (size_t)(end - start) : max_len; -} -#endif // HAVE_DECL_STRNLEN |