notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: struct dirent has no "d_type" on MinGW/MSYS2

Browse source 
I found current git tree does not compile on Windows because
struct dirent has no member "d_type" on MinGW/MSYS2.
(TOYAMA Shin-ich via Tuxpaint-devel list)
This commit is contained in:
Bill Kendrick 2020-11-21 14:26:08 -08:00
parent de907326cf
commit 032c89a65e
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tuxpaint.c
View file

@ -19071,6 +19071,7 @@ static int do_new_dialog(void)
DIR *d; DIR *d;
struct dirent *f; struct dirent *f;
struct dirent2 *fs; struct dirent2 *fs;
struct stat sbuf;
int place; int place;
char *dirname[NUM_PLACES_TO_LOOK]; char *dirname[NUM_PLACES_TO_LOOK];
char **d_names = NULL, **d_exts = NULL; char **d_names = NULL, **d_exts = NULL;
@ -19157,18 +19158,22 @@ static int do_new_dialog(void)
{ {
f = readdir(d); f = readdir(d);
if (f != NULL && f->d_type != DT_DIR) if (f !=NULL)
{ {
memcpy(&(fs[num_files_in_dirs].f), f, sizeof(struct dirent)); safe_snprintf(fname, sizeof(fname), "%s/%s", dirname[places_to_look], f->d_name);
fs[num_files_in_dirs].place = places_to_look; if (!stat(fname, &sbuf) && S_ISREG(sbuf.st_mode))
num_files_in_dirs++;
if (num_files_in_dirs >= things_alloced)
{ {
things_alloced = things_alloced + 32; memcpy(&(fs[num_files_in_dirs].f), f, sizeof(struct dirent));
fs[num_files_in_dirs].place = places_to_look;
fs = (struct dirent2 *)realloc(fs, sizeof(struct dirent2) * things_alloced); num_files_in_dirs++;
if (num_files_in_dirs >= things_alloced)
{
things_alloced = things_alloced + 32;
fs = (struct dirent2 *)realloc(fs, sizeof(struct dirent2) * things_alloced);
}
} }
} }
} }