--- Libc/Libc-763.13/include/string.h
+++ Libc/Libc-498.1.7/include/string.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2007, 2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2007 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -57,24 +57,25 @@
 
 #ifndef _STRING_H_
 #define	_STRING_H_
-
 #include <_types.h>
-
-#include <sys/cdefs.h>
-#include <Availability.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 */
 
-
-
-/* ANSI-C */
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 void	*memchr(const void *, int, size_t);
@@ -82,6 +83,10 @@
 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 *);
@@ -97,97 +102,50 @@
 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);
-__END_DECLS
 
-
-
-/* Additional functionality provided by:
- * POSIX.1c-1995,
- * POSIX.1i-1995,
- * and the omnibus ISO/IEC 9945-1: 1996
- */
-
-#if __DARWIN_C_LEVEL >= 199506L
-__BEGIN_DECLS
+/* Nonstandard routines */
+#ifndef _ANSI_SOURCE
+void	*memccpy(void *, const void *, int, size_t);
 char	*strtok_r(char *, const char *, char **);
-__END_DECLS
-#endif /* __DARWIN_C_LEVEL >= 199506L */
-
-
-
-/* Additional functionality provided by:
- * POSIX.1-2001
- */
-
-#if __DARWIN_C_LEVEL >= 200112L
-__BEGIN_DECLS
-int	 strerror_r(int, char *, size_t);
 char	*strdup(const char *);
-void	*memccpy(void *, const void *, int, size_t);
-__END_DECLS
-#endif /* __DARWIN_C_LEVEL >= 200112L */
-
-
-
-/* Additional functionality provided by:
- * POSIX.1-2008
- */
-
-#if __DARWIN_C_LEVEL >= 200809L
-__BEGIN_DECLS
-char	*stpcpy(char *, const char *);
-char    *stpncpy(char *, const char *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-char	*strndup(const char *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-size_t   strnlen(const char *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-char	*strsignal(int sig);
-__END_DECLS
-#endif /* __DARWIN_C_LEVEL >= 200809L */
-
-
-
-/* Darwin extensions */
-
-#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
-#ifndef _SSIZE_T
-#define _SSIZE_T
-typedef __darwin_ssize_t	ssize_t;
-#endif
-
-__BEGIN_DECLS
-void	*memmem(const void *, size_t, const void *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_7, __IPHONE_4_3);
-void     memset_pattern4(void *, const void *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_3_0);
-void     memset_pattern8(void *, const void *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_3_0);
-void     memset_pattern16(void *, const void *, size_t) __OSX_AVAILABLE_STARTING(__MAC_10_5, __IPHONE_3_0);
-
-char	*strcasestr(const char *, const char *);
-char	*strnstr(const char *, const char *, size_t);
+#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 *);
-
-/* SUS places swab() in unistd.h.  It is listed here for source compatibility */
+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
-
-/* Some functions historically defined in string.h were placed in strings.h
- * by SUS.  We are using "strings.h" instead of <strings.h> to avoid an issue
- * where /Developer/Headers/FlatCarbon/Strings.h could be included instead on
- * case-insensitive file systems.
- */
-#include "strings.h"
-#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
-
 
 #ifdef _USE_EXTENDED_LOCALES_
 #include <xlocale/_string.h>