X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/224c70764cab4e0e39a26aaf3ad3016552f62f55..15de9d6b4ab2de27ae24b13b7b6c4d55fffe4aef:/include/glob.h

diff --git a/include/glob.h b/include/glob.h
index 62b1756..06314af 100644
--- a/include/glob.h
+++ b/include/glob.h
@@ -41,11 +41,9 @@
 #define	_GLOB_H_
 
 #include <_types.h>
-
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef	__darwin_size_t	size_t;
-#endif
+#include <sys/cdefs.h>
+#include <Availability.h>
+#include <sys/_types/_size_t.h>
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 struct dirent;
@@ -58,7 +56,14 @@ typedef struct {
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc)(const char *, int);
+#ifdef __BLOCKS__
+	union {
+#endif /* __BLOCKS__ */
+		int (*gl_errfunc)(const char *, int);
+#ifdef __BLOCKS__
+		int (^gl_errblk)(const char *, int);
+	};
+#endif /* __BLOCKS__ */
 
 	/*
 	 * Alternate filesystem access methods for glob; replacement
@@ -103,9 +108,9 @@ typedef struct {
 #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 */
-//Begin-Libc
-#define GLOB_INODE64	0x80000000
-//End-Libc
+#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
@@ -123,6 +128,19 @@ int	glob(const char * __restrict, int, int (*)(const char *, int),
 	     glob_t * __restrict) LIBC_INODE64(glob);
 #endif /* !LIBC_ALIAS_GLOB */
 //End-Libc
+#ifdef __BLOCKS__
+//Begin-Libc
+#ifndef LIBC_ALIAS_GLOB_B
+//End-Libc
+int	glob_b(const char * __restrict, int, int (^)(const char *, int), 
+	     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_t * __restrict) LIBC_INODE64(glob_b);
+#endif /* !LIBC_ALIAS_GLOB_B */
+//End-Libc
+#endif /* __BLOCKS__ */
 void	globfree(glob_t *);
 __END_DECLS