Libc-1353.100.2.tar.gz

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

diff --git a/include/glob.h b/include/glob.h
index 784f2424ad795e7b2fb0744517e01214b55a30b2..c602c8e89b39a1363307c1a3b6e701fee0fc6a64 100644 (file)
--- a/include/glob.h
+++ b/include/glob.h
@@ -13,11 +13,7 @@
  * 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. 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
+ * 3. 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.
  *
@@ -41,11 +37,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;
@@ -131,14 +125,19 @@ int       glob(const char * __restrict, int, int (*)(const char *, int),
 #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_t * __restrict) __DARWIN_INODE64(glob_b);
+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), 
+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