--- Libc/Libc-320/include/dirent.h
+++ Libc/Libc-498/include/dirent.h
@@ -2,8 +2,6 @@
  * 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
@@ -64,35 +62,30 @@
  * The kernel defines the format of directory entries returned by 
  * the getdirentries(2) system call.
  */
-#include <sys/types.h>
+#include <_types.h>
 #include <sys/dirent.h>
 
-#ifdef _POSIX_SOURCE
-typedef void *	DIR;
-#else
+struct _telldir;		/* forward reference */
 
-#define	d_ino		d_fileno	/* backward compatibility */
+/* structure describing an open directory. */
+typedef struct {
+	int	__dd_fd;	/* file descriptor associated with directory */
+	long	__dd_loc;	/* offset in current buffer */
+	long	__dd_size;	/* amount of data returned by getdirentries */
+	char	*__dd_buf;	/* data buffer */
+	int	__dd_len;	/* size of data buffer */
+	long	__dd_seek;	/* magic cookie returned by getdirentries */
+	long	__dd_rewind;	/* magic cookie for rewinding */
+	int	__dd_flags;	/* flags for readdir */
+	__darwin_pthread_mutex_t __dd_lock; /* for thread locking */
+	struct _telldir *__dd_td; /* telldir position recording */
+} DIR;
 
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /* definitions for library routines operating on directories. */
 #define	DIRBLKSIZ	1024
 
-struct _telldir;		/* see telldir.h */
-
-/* structure describing an open directory. */
-typedef struct _dirdesc {
-	int	dd_fd;		/* file descriptor associated with directory */
-	long	dd_loc;		/* offset in current buffer */
-	long	dd_size;	/* amount of data returned by getdirentries */
-	char	*dd_buf;	/* data buffer */
-	int	dd_len;		/* size of data buffer */
-	long	dd_seek;	/* magic cookie returned by getdirentries */
-	long	dd_rewind;	/* magic cookie for rewinding */
-	int	dd_flags;	/* flags for readdir */
-	pthread_mutex_t	dd_lock; /* for thread locking */
-	struct _telldir *dd_td;	/* telldir position recording */
-} DIR;
-
-#define	dirfd(dirp)	((dirp)->dd_fd)
+#define	dirfd(dirp)	((dirp)->__dd_fd)
 
 /* flags for opendir2 */
 #define DTF_HIDEW	0x0001	/* hide whiteout entries */
@@ -100,31 +93,81 @@
 #define DTF_REWIND	0x0004	/* rewind after reading union stack */
 #define __DTF_READALL	0x0008	/* everything has been read */
 
-#ifndef NULL
-#define	NULL	0
-#endif
-
-#endif /* _POSIX_SOURCE */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
 #ifndef KERNEL
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-DIR *opendir(const char *);
-struct dirent *readdir(DIR *);
-void rewinddir(DIR *);
-int closedir(DIR *);
-#ifndef _POSIX_SOURCE
-DIR *__opendir2(const char *, int);
-long telldir(DIR *);
-void seekdir(DIR *, long);
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int alphasort(const void *, const void *) __DARWIN_INODE64(alphasort);
+#endif /* not POSIX */
+//Begin-Libc
+#ifndef LIBC_ALIAS_CLOSEDIR
+//End-Libc
+int closedir(DIR *) __DARWIN_ALIAS(closedir);
+//Begin-Libc
+#else /* LIBC_ALIAS_CLOSEDIR */
+int closedir(DIR *) LIBC_ALIAS(closedir);
+#endif /* !LIBC_ALIAS_CLOSEDIR */
+//End-Libc
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int getdirentries(int, char *, int, long *);
+#endif /* not POSIX */
+//Begin-Libc
+#ifndef LIBC_ALIAS_OPENDIR
+//End-Libc
+DIR *opendir(const char *) __DARWIN_ALIAS_I(opendir);
+//Begin-Libc
+#else /* LIBC_ALIAS_OPENDIR */
+DIR *opendir(const char *) LIBC_ALIAS_I(opendir);
+#endif /* !LIBC_ALIAS_OPENDIR */
+//End-Libc
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+//Begin-Libc
+#ifndef LIBC_ALIAS___OPENDIR2
+//End-Libc
+DIR *__opendir2(const char *, int) __DARWIN_ALIAS_I(__opendir2);
+//Begin-Libc
+#else /* LIBC_ALIAS___OPENDIR2 */
+DIR *__opendir2(const char *, int) LIBC_ALIAS_I(__opendir2);
+#endif /* !LIBC_ALIAS___OPENDIR2 */
+//End-Libc
+#endif /* not POSIX */
+struct dirent *readdir(DIR *) __DARWIN_INODE64(readdir);
+int readdir_r(DIR *, struct dirent *, struct dirent **) __DARWIN_INODE64(readdir_r);
+//Begin-Libc
+#ifndef LIBC_ALIAS_REWINDDIR
+//End-Libc
+void rewinddir(DIR *) __DARWIN_ALIAS_I(rewinddir);
+//Begin-Libc
+#else /* LIBC_ALIAS_REWINDDIR */
+void rewinddir(DIR *) LIBC_ALIAS_I(rewinddir);
+#endif /* !LIBC_ALIAS_REWINDDIR */
+//End-Libc
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 int scandir(const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(const void *, const void *));
-int alphasort(const void *, const void *);
-int getdirentries(int, char *, int, long *);
-int readdir_r(DIR *, struct dirent *, struct dirent **);
+    int (*)(struct dirent *), int (*)(const void *, const void *)) __DARWIN_INODE64(scandir);
 #endif /* not POSIX */
+//Begin-Libc
+#ifndef LIBC_ALIAS_SEEKDIR
+//End-Libc
+void seekdir(DIR *, long) __DARWIN_ALIAS_I(seekdir);
+//Begin-Libc
+#else /* LIBC_ALIAS_SEEKDIR */
+void seekdir(DIR *, long) LIBC_ALIAS_I(seekdir);
+#endif /* !LIBC_ALIAS_SEEKDIR */
+//End-Libc
+//Begin-Libc
+#ifndef LIBC_ALIAS_TELLDIR
+//End-Libc
+long telldir(DIR *) __DARWIN_ALIAS_I(telldir);
+//Begin-Libc
+#else /* LIBC_ALIAS_TELLDIR */
+long telldir(DIR *) LIBC_ALIAS_I(telldir);
+#endif /* !LIBC_ALIAS_TELLDIR */
+//End-Libc
 __END_DECLS
 
 #endif /* !KERNEL */