--- Libc/Libc-1725.40.4/include/_regex.h
+++ Libc/Libc-1669.40.2/include/_regex.h
@@ -94,13 +94,10 @@
 #define	_REGEX_H_
 #define	__REGEX_H_
 
-#include <_bounds.h>
 #include <_types.h>
 #include <Availability.h>
 #include <sys/_types/_size_t.h>
 
-_LIBC_SINGLE_BY_DEFAULT()
-
 /*********/
 /* types */
 /*********/
@@ -113,7 +110,7 @@
 typedef struct {
 	int re_magic;
 	size_t re_nsub;		/* number of parenthesized subexpressions */
-	const char *_LIBC_UNSAFE_INDEXABLE	re_endp;	/* end pointer for REG_PEND */
+	const char *re_endp;	/* end pointer for REG_PEND */
 	struct re_guts *re_g;	/* none of your business :-) */
 } regex_t;
 
@@ -218,32 +215,32 @@
 int	regcomp(regex_t * __restrict, const char * __restrict, int) LIBC_ALIAS(regcomp);
 #endif /* !LIBC_ALIAS_REGCOMP */
 //End-Libc
-size_t	regerror(int, const regex_t * __restrict, char *_LIBC_COUNT(__errbuf_size) __restrict, size_t __errbuf_size) __cold;
+size_t	regerror(int, const regex_t * __restrict, char * __restrict, size_t) __cold;
 /*
  * gcc under c99 mode won't compile "[ __restrict]" by itself.  As a workaround,
  * a dummy argument name is added.
  */
-int	regexec(const regex_t * __restrict, const char * __restrict, size_t __nmatch,
-		regmatch_t __pmatch[ __restrict _LIBC_COUNT(__nmatch)], int);
+int	regexec(const regex_t * __restrict, const char * __restrict, size_t,
+		regmatch_t __pmatch[ __restrict], int);
 void	regfree(regex_t *);
 
 #if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
 
 /* Darwin extensions */
-int	regncomp(regex_t * __restrict, const char *_LIBC_COUNT(__len) __restrict, size_t __len, int)
-		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
-int	regnexec(const regex_t * __restrict, const char *_LIBC_COUNT(__len) __restrict, size_t __len,
-		size_t __nmatch, regmatch_t __pmatch[ __restrict _LIBC_COUNT(__nmatch)], int)
+int	regncomp(regex_t * __restrict, const char * __restrict, size_t, int)
+		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
+int	regnexec(const regex_t * __restrict, const char * __restrict, size_t,
+		size_t, regmatch_t __pmatch[ __restrict], int)
 		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
 int	regwcomp(regex_t * __restrict, const wchar_t * __restrict, int)
 		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
-int	regwexec(const regex_t * __restrict, const wchar_t * __restrict, size_t __nmatch,
-		regmatch_t __pmatch[ __restrict _LIBC_COUNT(__nmatch)], int)
-		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
-int	regwncomp(regex_t * __restrict, const wchar_t * _LIBC_COUNT(__len) __restrict, size_t __len, int)
-		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
-int	regwnexec(const regex_t * __restrict, const wchar_t * _LIBC_COUNT(__len) __restrict,
-		size_t __len, size_t __nmatch, regmatch_t __pmatch[ __restrict _LIBC_COUNT(__nmatch)], int)
+int	regwexec(const regex_t * __restrict, const wchar_t * __restrict, size_t,
+		regmatch_t __pmatch[ __restrict], int)
+		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
+int	regwncomp(regex_t * __restrict, const wchar_t * __restrict, size_t, int)
+		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
+int	regwnexec(const regex_t * __restrict, const wchar_t * __restrict,
+		size_t, size_t, regmatch_t __pmatch[ __restrict], int)
 		__OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
 
 #endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */