From 46935565203e435849360a044df9df39444ce208 Mon Sep 17 00:00:00 2001 From: Georg Semmler Date: Mon, 8 Apr 2024 13:13:08 +0200 Subject: [PATCH] Rename the vendored strlcat symbol Fixes #927 --- include/ncconfigure.h | 3 ++- libdispatch/dmissing.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/ncconfigure.h b/include/ncconfigure.h index 496ec59e03..214b8150f6 100644 --- a/include/ncconfigure.h +++ b/include/ncconfigure.h @@ -69,7 +69,8 @@ char* strdup(const char*); #ifndef HAVE_STRLCAT #ifndef strlcat -size_t strlcat(char*,const char*,size_t); +#define strlcat nc_strlcat +size_t nc_strlcat(char*,const char*,size_t); #endif #endif diff --git a/libdispatch/dmissing.c b/libdispatch/dmissing.c index b53335cef0..42c2d773ec 100644 --- a/libdispatch/dmissing.c +++ b/libdispatch/dmissing.c @@ -117,7 +117,7 @@ strlcpy(char *dst, const char* src, size_t dsize) * If retval >= dsize, truncation occurred. */ size_t -strlcat(char* dst, const char* src, size_t dsize) +nc_strlcat(char* dst, const char* src, size_t dsize) { const char *odst = dst; const char *osrc = src;