claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1385 from richardg867/master

Browse Source 
Fix build for MSVC
This commit is contained in:
Miran Grča
2021-04-18 08:20:37 +02:00
committed by GitHub
parent 75564902dc dfdfc7fd8e
commit d555e9f52c
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/86box/plat_dir.h
View File

@@ -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 *);

2
src/include/tinyglib.h
View File

@@ -259,6 +259,7 @@ g_strv_length(gchar **str_array)
#define g_rand_new() calloc(1, sizeof(GRand))
#define g_return_val_if_fail(e, v) if (!(e)) return (v)
#define g_shell_parse_argv(a, b, c, d) !!(sizeof(b)) /* unimplemented */
#define g_strdup(str) ((str) ? strdup(str) : NULL)
#define g_warn_if_fail(e) do { if (!(e)) pclog("TinyGLib g_warn_if_fail(" #e ")\n"); } while (0)
#define g_warn_if_reached() pclog("TinyGLib g_warn_if_reached()\n")
#define g_warning(s, ...) tinyglib_pclog("g_warning", s, ##__VA_ARGS__)
@@ -271,7 +272,6 @@ g_strv_length(gchar **str_array)
#define g_rand_free free
#define g_realloc realloc
#define g_snprintf snprintf
#define g_strdup(str) str ? strdup(str) : NULL
#define g_strerror strerror
#define g_strfreev free
#define g_string_append_printf sprintf /* unimplemented */