--- Libc/Libc-1583.60.2/include/fts.h
+++ Libc/Libc-583/include/fts.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2003-2006, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2000, 2003-2006, 2008 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -59,14 +59,21 @@
 #define	_FTS_H_
 
 #include <sys/_types.h>
-#include <sys/_types/_dev_t.h>
-#include <sys/_types/_ino_t.h>
-#include <sys/_types/_nlink_t.h>
-
-#include <Availability.h>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wstrict-prototypes"
+
+#ifndef _DEV_T
+typedef	__darwin_dev_t		dev_t;		/* device number */
+#define _DEV_T
+#endif
+
+#ifndef	_INO_T
+typedef	__darwin_ino_t	ino_t;		/* inode number */
+#define _INO_T
+#endif
+
+#ifndef _NLINK_T
+typedef	__uint16_t		nlink_t;	/* link count */
+#define	_NLINK_T
+#endif
 
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
@@ -93,18 +100,12 @@
 #define	FTS_PHYSICAL	0x010		/* physical walk */
 #define	FTS_SEEDOT	0x020		/* return dot and dot-dot */
 #define	FTS_XDEV	0x040		/* don't cross devices */
-#define	FTS_WHITEOUT	0x080		/* (no longer supported) return whiteout information */
+#define	FTS_WHITEOUT	0x080		/* return whiteout information */
 #define	FTS_COMFOLLOWDIR 0x400		/* (non-std) follow command line symlinks for directories only */
-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1090) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 70000)
 #define	FTS_OPTIONMASK	0x4ff		/* valid user option mask */
-#else
-#define	FTS_NOSTAT_TYPE	0x800		/* (non-std) no stat, but use d_type in struct dirent when available */
-#define	FTS_OPTIONMASK	0xcff		/* valid user option mask */
-#endif
 
 #define	FTS_NAMEONLY	0x100		/* (private) child names only */
 #define	FTS_STOP	0x200		/* (private) unrecoverable error */
-#define	FTS_THREAD_FCHDIR	0x400	/* (private) use pthread_fchdir_np */
 #ifdef __BLOCKS__
 #define	FTS_BLOCK_COMPAR 0x80000000	/* fts_compar is a block */
 #endif /* __BLOCKS__ */
@@ -120,7 +121,7 @@
 	char *fts_accpath;		/* access path */
 	char *fts_path;			/* root path */
 	int fts_errno;			/* errno for this node */
-	int fts_symfd;			/* fd for symlink or chdir */
+	int fts_symfd;			/* fd for symlink */
 	unsigned short fts_pathlen;	/* strlen(fts_path) */
 	unsigned short fts_namelen;	/* strlen(fts_name) */
 
@@ -130,7 +131,6 @@
 
 #define	FTS_ROOTPARENTLEVEL	-1
 #define	FTS_ROOTLEVEL		 0
-#define	FTS_MAXLEVEL		 0x7fffffff
 	short fts_level;		/* depth (-1 to N) */
 
 #define	FTS_D		 1		/* preorder directory */
@@ -152,7 +152,6 @@
 #define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
 #define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
 #define	FTS_ISW		 0x04		/* this is a whiteout object */
-#define	FTS_CHDIRFD 0x08 /* indicates the fts_symfd field was set for chdir */
 	unsigned short fts_flags;	/* private flags for FTSENT structure */
 
 #define	FTS_AGAIN	 1		/* read node again */
@@ -166,7 +165,6 @@
 } FTSENT;
 
 #include <sys/cdefs.h>
-#include <Availability.h>
 
 __BEGIN_DECLS
 //Begin-Libc
@@ -199,22 +197,15 @@
 #endif /* !LIBC_ALIAS_FTS_OPEN */
 //End-Libc
 #ifdef __BLOCKS__
-#if __has_attribute(noescape)
-#define __fts_noescape __attribute__((__noescape__))
-#else
-#define __fts_noescape
-#endif
 //Begin-Libc
 #ifndef LIBC_ALIAS_FTS_OPEN_B
 //End-Libc
 FTS	*fts_open_b(char * const *, int,
-	    int (^)(const FTSENT **, const FTSENT **) __fts_noescape)
-	    __DARWIN_INODE64(fts_open_b) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
+	    int (^)(const FTSENT **, const FTSENT **)) __DARWIN_INODE64(fts_open_b);
 //Begin-Libc
 #else /* LIBC_ALIAS_FTS_OPEN */
 FTS	*fts_open_b(char * const *, int,
-	    int (^)(const FTSENT **, const FTSENT **) __fts_noescape)
-	    LIBC_INODE64(fts_open_b);
+	    int (^)(const FTSENT **, const FTSENT **)) LIBC_INODE64(fts_open_b);
 #endif /* !LIBC_ALIAS_FTS_OPEN */
 //End-Libc
 #endif /* __BLOCKS__ */
@@ -238,6 +229,4 @@
 //End-Libc
 __END_DECLS
 
-#pragma clang diagnostic pop
 #endif /* !_FTS_H_ */
-