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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 27445 invoked from network); 31 May 2023 09:25:55 -0000 Received: from second.openwall.net (193.110.157.125) by inbox.vuxu.org with ESMTPUTF8; 31 May 2023 09:25:55 -0000 Received: (qmail 1769 invoked by uid 550); 31 May 2023 09:23:44 -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 32628 invoked from network); 31 May 2023 09:23:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Ga1Mt42dYrtfmSs/fTjEUE2p7+Dr3lJbl90PVGVdpWg=; b=Iutd07tr4TSEWpmIf6gl97hDgE6/HDw/BvOZLRTgbf58XKNJIJPZEpb7 ms3HTY5ETEQswIyetI6ta/H4d69H19TlPl2UDMupDYIu++E/upSx5GGzn Du5lZCgn3Cl+xEK6vT59uEElv2PomIshPsZThSkI134gL7X+71duohUe8 M=; 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,205,1681164000"; d="scan'208";a="57428738" From: Jens Gustedt To: musl@lists.openwall.com Date: Wed, 31 May 2023 11:22:52 +0200 Message-Id: <4f9a55f6fed9598fd1ef6f8999bcda4fc9ff8043.1685522953.git.Jens.Gustedt@inria.fr> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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