From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 20194 invoked from network); 24 May 2023 14:05:31 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 24 May 2023 14:05:31 -0000 Received: (qmail 32699 invoked by uid 550); 24 May 2023 14:01:46 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 31892 invoked from network); 24 May 2023 14:01:35 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=message-id:in-reply-to:references:from:date:to: resent-date:resent-from:subject:resent-message-id: resent-to; bh=Ga1Mt42dYrtfmSs/fTjEUE2p7+Dr3lJbl90PVGVdpWg=; b=q9LFqeJ/r1ayxY0vuQWHN4RwOTeJm2xFoI39JKK2ldR+5jvSkzazhrEi X2ANW5AbfD4J0r+X9fhLQwgK7RaFSiCf5/PWUlDk9flPaMu/jOyX2leXk 0JK60UhDAfp3XJm06WczFrlk7VQchpMN/2rI7ptXTqS4n9XomCjzSTfx7 8=; Authentication-Results: mail3-relais-sop.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=jens.gustedt@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.00,189,1681164000"; d="scan'208";a="56883754" Message-Id: <1942ac523bf082de971930d58d531ba289f93a65.1684932861.git.Jens.Gustedt@inria.fr> In-Reply-To: References: From: Jens Gustedt Date: Sat, 22 Apr 2023 22:06:13 +0200 To: musl@lists.openwall.com Resent-Date: Wed, 24 May 2023 15:57:05 +0200 Resent-From: =?UTF-8?B?SuKCkeKCmeKCmw==?= Gustedt Resent-Message-ID: <20230524155705.0488fcf8@inria.fr> Resent-To: musl@lists.openwall.com Subject: [musl] [C23 divers headers 05/17] C23: memccpy, strdup and strndup are now standard C Just remove the feature guards around these. These guards had not even strictly been necessary before, because prefixes mem and str are reserved. --- include/string.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/string.h b/include/string.h index db73d2a9..7df7a402 100644 --- a/include/string.h +++ b/include/string.h @@ -55,6 +55,10 @@ size_t strlen (const char *); char *strerror (int); +char *strdup (const char *); +char *strndup (const char *, size_t); +void *memccpy (void *__restrict, const void *__restrict, int, size_t); + #if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) #include #endif @@ -67,8 +71,6 @@ int strerror_r (int, char *, size_t); char *stpcpy(char *__restrict, const char *__restrict); char *stpncpy(char *__restrict, const char *__restrict, size_t); size_t strnlen (const char *, size_t); -char *strdup (const char *); -char *strndup (const char *, size_t); char *strsignal(int); char *strerror_l (int, locale_t); int strcoll_l (const char *, const char *, locale_t); @@ -76,11 +78,6 @@ size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t); void *memmem(const void *, size_t, const void *, size_t); #endif -#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ - || defined(_BSD_SOURCE) -void *memccpy (void *__restrict, const void *__restrict, int, size_t); -#endif - #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) char *strsep(char **, const char *); size_t strlcat (char *, const char *, size_t); -- 2.34.1