yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stb.h: _MSC_VER in readdir_raw -> _WIN32

Browse Source 
For MinGW.
This commit is contained in:
Fabian Giesen 2021-07-06 20:19:51 -07:00
parent e817b4a998
commit 76a0a00874
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deprecated/stb.h
View File

@ -6132,7 +6132,7 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
char buffer[4096], with_slash[4096]; char buffer[4096], with_slash[4096];
size_t n; size_t n;
#ifdef _MSC_VER #ifdef WIN32
stb__wchar *ws; stb__wchar *ws;
struct _wfinddata_t data; struct _wfinddata_t data;
#ifdef _WIN64 #ifdef _WIN64
@ -6142,7 +6142,7 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
const long none = -1; const long none = -1;
long z; long z;
#endif #endif
#else // !_MSC_VER #else // !WIN32
const DIR *none = NULL; const DIR *none = NULL;
DIR *z; DIR *z;
#endif #endif
@ -6159,7 +6159,7 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
if (!stb_strscpy(with_slash,buffer,sizeof(with_slash))) if (!stb_strscpy(with_slash,buffer,sizeof(with_slash)))
return NULL; return NULL;
#ifdef _MSC_VER #ifdef WIN32
if (!stb_strscpy(buffer+n,"*.*",sizeof(buffer)-n)) if (!stb_strscpy(buffer+n,"*.*",sizeof(buffer)-n))
return NULL; return NULL;
ws = stb__from_utf8(buffer); ws = stb__from_utf8(buffer);
@ -6170,7 +6170,7 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
if (z != none) { if (z != none) {
int nonempty = STB_TRUE; int nonempty = STB_TRUE;
#ifndef _MSC_VER #ifndef WIN32
struct dirent *data = readdir(z); struct dirent *data = readdir(z);
nonempty = (data != NULL); nonempty = (data != NULL);
#endif #endif
@ -6179,7 +6179,7 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
do { do {
int is_subdir; int is_subdir;
#ifdef _MSC_VER #ifdef WIN32
char *name = stb__to_utf8((stb__wchar *)data.name); char *name = stb__to_utf8((stb__wchar *)data.name);
if (name == NULL) { if (name == NULL) {
fprintf(stderr, "%s to convert '%S' to %s!\n", "Unable", data.name, "utf8"); fprintf(stderr, "%s to convert '%S' to %s!\n", "Unable", data.name, "utf8");
@ -6207,13 +6207,13 @@ static char **readdir_raw(char *dir, int return_subdirs, char *mask)
} }
} }
} }
#ifdef _MSC_VER #ifdef WIN32
while (0 == _wfindnext(z, &data)); while (0 == _wfindnext(z, &data));
#else #else
while ((data = readdir(z)) != NULL); while ((data = readdir(z)) != NULL);
#endif #endif
} }
#ifdef _MSC_VER #ifdef WIN32
_findclose(z); _findclose(z);
#else #else
closedir(z); closedir(z);