--- Libc/Libc-498/include/glob.h
+++ Libc/Libc-320/include/glob.h
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,27 +58,18 @@
  * SUCH DAMAGE.
  *
  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: /repoman/r/ncvs/src/include/glob.h,v 1.7 2002/07/17 04:58:09 mikeh Exp $
  */
 
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
-#include <_types.h>
+#include <sys/cdefs.h>
 
-#ifndef _SIZE_T
-#define _SIZE_T
-typedef	__darwin_size_t	size_t;
-#endif
-
-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-struct dirent;
 struct stat;
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 typedef struct {
-	size_t gl_pathc;	/* Count of total paths so far. */
+	int 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_offs;		/* Reserved at beginning of gl_pathv. */
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
@@ -66,63 +81,33 @@
 	 * 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) */
+	struct dirent *(*gl_readdir)(void *);	
 	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) */
 } glob_t;
 
-/* Believed to have been introduced in 1003.2-1992 */
 #define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
 #define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
 #define	GLOB_ERR	0x0004	/* Return on error. */
 #define	GLOB_MARK	0x0008	/* Append / to matching directories. */
 #define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
 #define	GLOB_NOSORT	0x0020	/* Don't sort. */
-#define	GLOB_NOESCAPE	0x2000	/* Disable backslash escaping. */
 
-/* Error values returned by glob(3) */
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABORTED	(-2)	/* Unignored error. */
-#define	GLOB_NOMATCH	(-3)	/* No match and GLOB_NOCHECK was not set. */
-#define	GLOB_NOSYS	(-4)	/* Obsolete: source comptability only. */
-
+#ifndef _POSIX_SOURCE
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
 #define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
 #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
+#endif
 
-/* source compatibility, these are the old names */
-#define GLOB_MAXPATH	GLOB_LIMIT
-#define	GLOB_ABEND	GLOB_ABORTED
+#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
+#define	GLOB_ABEND	(-2)	/* Unignored error. */
 
 __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
+int	glob(const char *, int, int (*)(const char *, int), glob_t *);
 void	globfree(glob_t *);
 __END_DECLS