Revert "unix.ffi: be more explicit about dirent64."

This reverts commit edf456149330d44995b1c8bdf61a1c5d2617ed9c.

diff --git a/basis/io/directories/unix/linux/linux.factor b/basis/io/directories/unix/linux/linux.factor
index 45c1a146d8b4716b71fb2c9200342ed7b7806701..bc1e53366d9f2ddb835c288a43816c54c0cfd3ad 100644 (file)
--- a/basis/io/directories/unix/linux/linux.factor
+++ b/basis/io/directories/unix/linux/linux.factor
@@ -12,6 +12,6 @@ IN: io.directories.unix.linux
 
 M: linux (directory-entries) ( path -- seq )
     [
-        dirent64 <struct>
+        dirent <struct>
         '[ _ _ next-dirent ] [ >directory-entry ] produce nip
     ] with-unix-directory ;

diff --git a/basis/unix/ffi/linux/linux.factor b/basis/unix/ffi/linux/linux.factor
index 711bf742094af2e38729f488a8eac236ce098650..31afb2365dd3047f0b1ce5fb0b1f21a113e7e6ec 100644 (file)
--- a/basis/unix/ffi/linux/linux.factor
+++ b/basis/unix/ffi/linux/linux.factor
@@ -98,18 +98,17 @@ STRUCT: passwd
     { pw_dir c-string }
     { pw_shell c-string } ;
 
-STRUCT: dirent64
+! dirent64
+STRUCT: dirent
     { d_ino ulonglong }
     { d_off longlong }
     { d_reclen ushort }
     { d_type uchar }
     { d_name char[256] } ;
 
-ALIAS: dirent dirent64
-
 FUNCTION: int open64 ( c-string path, int flags, int prot ) ;
-FUNCTION: dirent64* readdir64 ( DIR* dirp ) ;
-FUNCTION: int readdir64_r ( void* dirp, dirent64* entry, dirent64** result ) ;
+FUNCTION: dirent* readdir64 ( DIR* dirp ) ;
+FUNCTION: int readdir64_r ( void* dirp, dirent* entry, dirent** result ) ;
 
 FUNCTION: ssize_t sendfile ( int out_fd, int in_fd, off_t* offset, size_t count ) ;