sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-24 19:42:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#24704: remove strnlen back-compat code

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2022-03-29 08:09:32 +01:00
parent b65038ec94
commit 548121d366
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1048,7 +1048,6 @@ AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
[#include <sys/types.h> [#include <sys/types.h>
#include <ifaddrs.h>] #include <ifaddrs.h>]
) )
AC_CHECK_DECLS([strnlen])
dnl These are used for daemonization in dashd dnl These are used for daemonization in dashd
AC_CHECK_DECLS([fork]) AC_CHECK_DECLS([fork])

1
src/Makefile.am
View File

@ -792,7 +792,6 @@ libbitcoin_util_a_SOURCES = \
support/lockedpool.cpp \ support/lockedpool.cpp \
chainparamsbase.cpp \ chainparamsbase.cpp \
clientversion.cpp \ clientversion.cpp \
compat/strnlen.cpp \
fs.cpp \ fs.cpp \
interfaces/echo.cpp \ interfaces/echo.cpp \
interfaces/handler.cpp \ interfaces/handler.cpp \

4
src/compat.h
View File

@ -81,10 +81,6 @@ typedef int32_t ssize_t;
#endif #endif
#endif #endif
#if HAVE_DECL_STRNLEN == 0
size_t strnlen( const char *start, size_t max_len);
#endif // HAVE_DECL_STRNLEN
#ifndef WIN32 #ifndef WIN32
typedef void* sockopt_arg_type; typedef void* sockopt_arg_type;
#else #else

18
src/compat/strnlen.cpp
View File

@ -1,18 +0,0 @@
// Copyright (c) 2009-2014 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