Loading...
--- Libc/Libc-583/include/glob.h
+++ Libc/Libc-498/include/glob.h
@@ -58,14 +58,7 @@
int gl_flags; /* Copy of flags parameter to glob. */
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);
/*
* Alternate filesystem access methods for glob; replacement
@@ -110,9 +103,9 @@
#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__ */
+//Begin-Libc
+#define GLOB_INODE64 0x80000000
+//End-Libc
/* source compatibility, these are the old names */
#define GLOB_MAXPATH GLOB_LIMIT
@@ -130,19 +123,6 @@
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