Libc-583.tar.gz

[apple/libc.git] / include / glob.h

diff --git a/include/glob.h b/include/glob.h
index 13c8da42b4b4e7d866fe91bb9017bc8c13f0dd73..784f2424ad795e7b2fb0744517e01214b55a30b2 100644 (file)
--- a/include/glob.h
+++ b/include/glob.h
@@ -58,7 +58,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,6 +110,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 */
+#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
@@ -120,6 +130,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);
+//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