Merge "implement missing seekdir and telldir"

[android-sdk/platform-bionic.git] / libc / include / dirent.h

diff --git a/libc/include/dirent.h b/libc/include/dirent.h
index bfe4ea42a08e0cdfbc2e6ea9ef167696e5c7a1d9..63716a4b7cbcd108019d4f1139ba3b7040186a72 100644 (file)
--- a/libc/include/dirent.h
+++ b/libc/include/dirent.h
@@ -56,6 +56,14 @@ __BEGIN_DECLS
 struct dirent { __DIRENT64_BODY };
 struct dirent64 { __DIRENT64_BODY };
 
+#undef __DIRENT64_BODY
+
+/* glibc compatibility. */
+#undef _DIRENT_HAVE_D_NAMLEN /* Linux doesn't have a d_namlen field. */
+#define _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_TYPE
+
 #define d_fileno d_ino
 
 typedef struct DIR DIR;
@@ -68,12 +76,13 @@ extern int readdir_r(DIR*, struct dirent*, struct dirent**);
 extern int readdir64_r(DIR*, struct dirent64*, struct dirent64**);
 extern int closedir(DIR*);
 extern void rewinddir(DIR*);
+extern void seekdir(DIR*, long);
+extern long telldir(DIR*);
 extern int dirfd(DIR*);
 extern int alphasort(const struct dirent**, const struct dirent**);
 extern int alphasort64(const struct dirent64**, const struct dirent64**);
 extern int scandir(const char*, struct dirent***, int (*)(const struct dirent*), int (*)(const struct dirent**, const struct dirent**));
 extern int scandir64(const char*, struct dirent64***, int (*)(const struct dirent64*), int (*)(const struct dirent64**, const struct dirent64**));
-extern int getdents(unsigned int, struct dirent*, unsigned int);
 
 __END_DECLS