--- Libc/Libc-1725.40.4/include/glob.h
+++ Libc/Libc-391/include/glob.h
@@ -13,7 +13,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -36,53 +40,41 @@
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
+#include <sys/cdefs.h>
 #include <_types.h>
-#include <sys/cdefs.h>
-#include <_bounds.h>
-#include <Availability.h>
-#include <sys/_types/_size_t.h>
 
-_LIBC_SINGLE_BY_DEFAULT()
+#ifndef _SIZE_T
+#define _SIZE_T
+typedef	__darwin_size_t	size_t;
+#endif
 
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+#ifndef _POSIX_C_SOURCE
 struct dirent;
 struct stat;
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif /* _POSIX_C_SOURCE */
 typedef struct {
 	size_t gl_pathc;	/* Count of total paths so far. */
 	int gl_matchc;		/* Count of paths matching pattern. */
 	size_t gl_offs;		/* Reserved at beginning of gl_pathv. */
 	int gl_flags;		/* Copy of flags parameter to glob. */
-	char *_LIBC_CSTR *_LIBC_COUNT(gl_matchc)	gl_pathv; /* List of paths matching pattern. */
+	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
-#ifdef __BLOCKS__
-	union {
-#endif /* __BLOCKS__ */
-		int (*gl_errfunc)(const char *, int);
-#ifdef __BLOCKS__
-		int (^gl_errblk)(const char *, int);
-	};
-#endif /* __BLOCKS__ */
+	int (*gl_errfunc)(const char *, int);
 
+#ifndef _POSIX_C_SOURCE
 	/*
 	 * Alternate filesystem access methods for glob; replacement
 	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
 	 * and lstat(2).
 	 */
 	void (*gl_closedir)(void *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 	struct dirent *(*gl_readdir)(void *);
-#else /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-	void *(*gl_readdir)(void *);
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 	void *(*gl_opendir)(const char *);
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 	int (*gl_lstat)(const char *, struct stat *);
 	int (*gl_stat)(const char *, struct stat *);
-#else /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
-	int (*gl_lstat)(const char *, void *);
-	int (*gl_stat)(const char *, void *);
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#else /* _POSIX_C_SOURCE */
+	void *_gl_reserved[5];
+#endif /* _POSIX_C_SOURCE */
 } glob_t;
 
 /* Believed to have been introduced in 1003.2-1992 */
@@ -107,44 +99,14 @@
 #define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
 #define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
 #define	GLOB_LIMIT	0x1000	/* limit number of returned paths */
-#ifdef __BLOCKS__
-#define	_GLOB_ERR_BLOCK	0x80000000 /* (internal) error callback is a block */
-#endif /* __BLOCKS__ */
 
 /* source compatibility, these are the old names */
 #define GLOB_MAXPATH	GLOB_LIMIT
 #define	GLOB_ABEND	GLOB_ABORTED
 
 __BEGIN_DECLS
-//Begin-Libc
-#ifndef LIBC_ALIAS_GLOB
-//End-Libc
 int	glob(const char * __restrict, int, int (*)(const char *, int), 
-	     glob_t * __restrict) __DARWIN_INODE64(glob);
-//Begin-Libc
-#else /* LIBC_ALIAS_GLOB */
-int	glob(const char * __restrict, int, int (*)(const char *, int), 
-	     glob_t * __restrict) LIBC_INODE64(glob);
-#endif /* !LIBC_ALIAS_GLOB */
-//End-Libc
-#ifdef __BLOCKS__
-#if __has_attribute(noescape)
-#define __glob_noescape __attribute__((__noescape__))
-#else
-#define __glob_noescape
-#endif
-//Begin-Libc
-#ifndef LIBC_ALIAS_GLOB_B
-//End-Libc
-int	glob_b(const char * __restrict, int, int (^)(const char *, int) __glob_noescape,
-	     glob_t * __restrict) __DARWIN_INODE64(glob_b) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-//Begin-Libc
-#else /* LIBC_ALIAS_GLOB_B */
-int	glob_b(const char * __restrict, int, int (^)(const char *, int) __glob_noescape,
-	     glob_t * __restrict) LIBC_INODE64(glob_b);
-#endif /* !LIBC_ALIAS_GLOB_B */
-//End-Libc
-#endif /* __BLOCKS__ */
+	     glob_t * __restrict);
 void	globfree(glob_t *);
 __END_DECLS