From 867f76d9b491c3a2ebd8fca6cb353cbbf14ea134 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sat, 17 Apr 2021 20:17:27 -0300 Subject: [PATCH] Fix the Windows dirent reimplementation structure name --- src/include/86box/plat_dir.h | 6 +++--- src/win/win_opendir.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/86box/plat_dir.h b/src/include/86box/plat_dir.h index 948db8c84..b8280404c 100644 --- a/src/include/86box/plat_dir.h +++ b/src/include/86box/plat_dir.h @@ -25,7 +25,7 @@ # define MAXDIRLEN 127 -struct direct { +struct dirent { long d_ino; unsigned short d_reclen; unsigned short d_off; @@ -49,7 +49,7 @@ typedef struct { #else char dir[MAXDIRLEN+1]; /* open dir */ #endif - struct direct dent; /* actual directory entry */ + struct dirent dent; /* actual directory entry */ } DIR; @@ -65,7 +65,7 @@ extern DIR *opendirw(const wchar_t *); #else extern DIR *opendir(const char *); #endif -extern struct direct *readdir(DIR *); +extern struct dirent *readdir(DIR *); extern long telldir(DIR *); extern void seekdir(DIR *, long); extern int closedir(DIR *); diff --git a/src/win/win_opendir.c b/src/win/win_opendir.c index 1740140cc..d7755e372 100644 --- a/src/win/win_opendir.c +++ b/src/win/win_opendir.c @@ -124,7 +124,7 @@ closedir(DIR *p) * standard "." and ".." entries. Many applications do assume * this anyway, so we simply fake these entries. */ -struct direct * +struct dirent * readdir(DIR *p) { FINDATA *ffp;