--- Libc/Libc-498/include/string.h
+++ Libc/Libc-1669.40.2/include/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2007, 2010, 2023 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -55,105 +55,8 @@
  *	@(#)string.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _STRING_H_
-#define	_STRING_H_
-#include <_types.h>
-
-#ifndef	_SIZE_T
-#define	_SIZE_T
-typedef	__darwin_size_t		size_t;
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)	/* For swab */
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __darwin_ssize_t	ssize_t;
-#endif
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-
-#ifndef NULL
-#define NULL __DARWIN_NULL
-#endif /* ! NULL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	*memchr(const void *, int, size_t);
-int	 memcmp(const void *, const void *, size_t);
-void	*memcpy(void *, const void *, size_t);
-void	*memmove(void *, const void *, size_t);
-void	*memset(void *, int, size_t);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*stpcpy(char *, const char *);
-char	*strcasestr(const char *, const char *);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-char	*strcat(char *, const char *);
-char	*strchr(const char *, int);
-int	 strcmp(const char *, const char *);
-int	 strcoll(const char *, const char *);
-char	*strcpy(char *, const char *);
-size_t	 strcspn(const char *, const char *);
-//Begin-Libc
-#ifndef LIBC_ALIAS_STRERROR
-//End-Libc
-char	*strerror(int) __DARWIN_ALIAS(strerror);
-//Begin-Libc
-#else /* LIBC_ALIAS_STRERROR */
-char	*strerror(int) LIBC_ALIAS(strerror);
-#endif /* !LIBC_ALIAS_STRERROR */
-//End-Libc
-int	 strerror_r(int, char *, size_t);
-size_t	 strlen(const char *);
-char	*strncat(char *, const char *, size_t);
-int	 strncmp(const char *, const char *, size_t);
-char	*strncpy(char *, const char *, size_t);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-char	*strnstr(const char *, const char *, size_t);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-char	*strpbrk(const char *, const char *);
-char	*strrchr(const char *, int);
-size_t	 strspn(const char *, const char *);
-char	*strstr(const char *, const char *);
-char	*strtok(char *, const char *);
-size_t	 strxfrm(char *, const char *, size_t);
-
-/* Nonstandard routines */
-#ifndef _ANSI_SOURCE
-void	*memccpy(void *, const void *, int, size_t);
-char	*strtok_r(char *, const char *, char **);
-char	*strdup(const char *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-int	 bcmp(const void *, const void *, size_t);
-void	 bcopy(const void *, void *, size_t);
-void	 bzero(void *, size_t);
-int	 ffs(int);
-int	 ffsl(long);
-int	 fls(int);
-int	 flsl(long);
-char	*index(const char *, int);
-void     memset_pattern4(void *, const void *, size_t);
-void     memset_pattern8(void *, const void *, size_t);
-void     memset_pattern16(void *, const void *, size_t);
-char	*rindex(const char *, int);
-int	 strcasecmp(const char *, const char *);
-size_t	 strlcat(char *, const char *, size_t);
-size_t	 strlcpy(char *, const char *, size_t);
-void	 strmode(int, char *);
-int	 strncasecmp(const char *, const char *, size_t);
-char	*strsep(char **, const char *);
-char	*strsignal(int sig);
-void	 swab(const void * __restrict, void * __restrict, ssize_t);
-#endif	/* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif 	/* !_ANSI_SOURCE */
-__END_DECLS
+#include <_string.h>
 
 #ifdef _USE_EXTENDED_LOCALES_
 #include <xlocale/_string.h>
 #endif /* _USE_EXTENDED_LOCALES_ */
-
-#if defined (__GNUC__) && _FORTIFY_SOURCE > 0 && !defined (__cplusplus)
-/* Security checking functions.  */
-#include <secure/_string.h>
-#endif
-
-#endif /* _STRING_H_ */