Skip to content

Commit f4fba57

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24704: compat: remove strnlen back-compat code
d4ba2b2 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 d4ba2b2 Tree-SHA512: d1beb9df58464feea3076091361d7d46e4a8901e347644a5fa6f24e052ca24ee0c7c0dd3f2a3d682b0204bf50430fa89eac62121691ea08af6dcf6b907bdec87
2 parents f089a08 + d4ba2b2 commit f4fba57

File tree

5 files changed

+0
-28
lines changed

5 files changed

+0
-28
lines changed

build_msvc/bitcoin_config.h.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@
125125
don't. */
126126
#define HAVE_DECL_STRERROR_R 0
127127

128-
/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
129-
don't. */
130-
#define HAVE_DECL_STRNLEN 1
131-
132128
/* Define if the dllexport attribute is supported. */
133129
#define HAVE_DLLEXPORT_ATTRIBUTE 1
134130

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,6 @@ AC_CHECK_DECLS([getifaddrs, freeifaddrs],[CHECK_SOCKET],,
984984
[#include <sys/types.h>
985985
#include <ifaddrs.h>]
986986
)
987-
AC_CHECK_DECLS([strnlen])
988987

989988
dnl These are used for daemonization in bitcoind
990989
AC_CHECK_DECLS([fork])

src/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,6 @@ libbitcoin_util_a_SOURCES = \
606606
chainparamsbase.cpp \
607607
clientversion.cpp \
608608
compat/glibcxx_sanity.cpp \
609-
compat/strnlen.cpp \
610609
fs.cpp \
611610
interfaces/echo.cpp \
612611
interfaces/handler.cpp \

src/compat.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ typedef int32_t ssize_t;
8080
#endif
8181
#endif
8282

83-
#if HAVE_DECL_STRNLEN == 0
84-
size_t strnlen( const char *start, size_t max_len);
85-
#endif // HAVE_DECL_STRNLEN
86-
8783
#ifndef WIN32
8884
typedef void* sockopt_arg_type;
8985
#else

src/compat/strnlen.cpp

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)