am 8276d287: Merge "Our dirent is a dirent64."

* commit '8276d2875f64587e266567f5bb2c5e0c70ef0a5d':
  Our dirent is a dirent64.
This commit is contained in:
Elliott Hughes 2014-01-08 17:20:16 -08:00 committed by Android Git Automerger
commit 8c6c9801f1

View File

@ -25,6 +25,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _DIRENT_H_ #ifndef _DIRENT_H_
#define _DIRENT_H_ #define _DIRENT_H_
@ -34,15 +35,15 @@
__BEGIN_DECLS __BEGIN_DECLS
#ifndef DT_UNKNOWN #ifndef DT_UNKNOWN
#define DT_UNKNOWN 0 #define DT_UNKNOWN 0
#define DT_FIFO 1 #define DT_FIFO 1
#define DT_CHR 2 #define DT_CHR 2
#define DT_DIR 4 #define DT_DIR 4
#define DT_BLK 6 #define DT_BLK 6
#define DT_REG 8 #define DT_REG 8
#define DT_LNK 10 #define DT_LNK 10
#define DT_SOCK 12 #define DT_SOCK 12
#define DT_WHT 14 #define DT_WHT 14
#endif #endif
struct dirent { struct dirent {
@ -52,23 +53,20 @@ struct dirent {
unsigned char d_type; unsigned char d_type;
char d_name[256]; char d_name[256];
}; };
#define dirent64 dirent
typedef struct DIR DIR; typedef struct DIR DIR;
extern DIR* opendir(const char* dirpath); extern DIR* opendir(const char*);
extern DIR* fdopendir(int fd); extern DIR* fdopendir(int);
extern struct dirent* readdir(DIR* dirp); extern struct dirent* readdir(DIR*);
extern int readdir_r(DIR* dirp, struct dirent* entry, struct dirent** result); extern int readdir_r(DIR*, struct dirent*, struct dirent**);
extern int closedir(DIR* dirp); extern int closedir(DIR*);
extern void rewinddir(DIR* dirp); extern void rewinddir(DIR*);
extern int dirfd(DIR* dirp); extern int dirfd(DIR*);
extern int alphasort(const struct dirent** a, const struct dirent** b); extern int alphasort(const struct dirent**, const struct dirent**);
extern int scandir(const char* dir, struct dirent*** namelist, extern int scandir(const char*, struct dirent***, int (*)(const struct dirent*), int (*)(const struct dirent**, const struct dirent**));
int(*filter)(const struct dirent*), extern int getdents(unsigned int, struct dirent*, unsigned int);
int(*compar)(const struct dirent**,
const struct dirent**));
extern int getdents(unsigned int, struct dirent*, unsigned int);
__END_DECLS __END_DECLS