From bce8b1eff617da9a9c8e47a8938823e1d2326500 Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 19 Oct 2008 13:43:42 -0500
Subject: [PATCH] DIR is not meant to be explicit

---
 basis/unix/bsd/macosx/macosx.factor | 18 ------------------
 basis/unix/unix.factor              |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/basis/unix/bsd/macosx/macosx.factor b/basis/unix/bsd/macosx/macosx.factor
index 96e2cde163..6270dc53b1 100644
--- a/basis/unix/bsd/macosx/macosx.factor
+++ b/basis/unix/bsd/macosx/macosx.factor
@@ -141,24 +141,6 @@ C-STRUCT: _opaque_pthread_mutex_t
 
 TYPEDEF: _opaque_pthread_mutex_t* __darwin_pthread_mutex_t
 
-C-STRUCT: DIR 
-    { "int" "__dd_fd" }
-    { "long" "__dd_loc" }
-    { "long" "__dd_size" }
-    { "char*" "__dd_buf" }
-    { "int" "__dd_len" }
-    { "long" "__dd_seek" }
-    { "long" "__dd_rewind" }
-    { "int" "__dd_flags" }
-    { "__darwin_pthread_mutex_t" "__dd_lock" }
-    { "void*" "__dd_td" } ;
-
-
-! #define DIRSIZ(dp) \
-    ! ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-
-!  __DARWIN_STRUCT_DIRENTRY { \
-
 : __DARWIN_MAXPATHLEN 1024 ; inline
 : __DARWIN_MAXNAMELEN 255 ; inline
 : __DARWIN_MAXNAMELEN+1 255 ; inline
diff --git a/basis/unix/unix.factor b/basis/unix/unix.factor
index ab49cd3f45..d7af214a49 100644
--- a/basis/unix/unix.factor
+++ b/basis/unix/unix.factor
@@ -160,7 +160,7 @@ FUNCTION: int pipe ( int* filedes ) ;
 FUNCTION: void* popen ( char* command, char* type ) ;
 FUNCTION: ssize_t read ( int fd, void* buf, size_t nbytes ) ;
 
-FUNCTION: int readdir_r ( DIR* dirp, dirent* entry, dirent** result ) ;
+FUNCTION: int readdir_r ( void* dirp, dirent* entry, dirent** result ) ;
 
 FUNCTION: ssize_t readlink ( char* path, char* buf, size_t bufsize ) ;