80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2021-04-20 03:24:48 +02:00
parent 17c3056681 d555e9f52c
commit dca94261fe
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@@ -32,7 +32,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#include <dirent.h>
#define HAVE_STDARG_H #define HAVE_STDARG_H
#include <86box/86box.h> #include <86box/86box.h>
#include "cpu.h" #include "cpu.h"
@@ -64,6 +63,7 @@
#include <86box/video.h> #include <86box/video.h>
#include <86box/plat.h> #include <86box/plat.h>
#include <86box/plat_midi.h> #include <86box/plat_midi.h>
#include <86box/plat_dir.h>
#include <86box/ui.h> #include <86box/ui.h>

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

@@ -25,7 +25,7 @@
# define MAXDIRLEN 127 # define MAXDIRLEN 127
struct direct { struct dirent {
long d_ino; long d_ino;
unsigned short d_reclen; unsigned short d_reclen;
unsigned short d_off; unsigned short d_off;
@@ -49,7 +49,7 @@ typedef struct {
#else #else
char dir[MAXDIRLEN+1]; /* open dir */ char dir[MAXDIRLEN+1]; /* open dir */
#endif #endif
struct direct dent; /* actual directory entry */ struct dirent dent; /* actual directory entry */
} DIR; } DIR;
@@ -65,7 +65,7 @@ extern DIR *opendirw(const wchar_t *);
#else #else
extern DIR *opendir(const char *); extern DIR *opendir(const char *);
#endif #endif
extern struct direct *readdir(DIR *); extern struct dirent *readdir(DIR *);
extern long telldir(DIR *); extern long telldir(DIR *);
extern void seekdir(DIR *, long); extern void seekdir(DIR *, long);
extern int closedir(DIR *); 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_rand_new() calloc(1, sizeof(GRand))
#define g_return_val_if_fail(e, v) if (!(e)) return (v) #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_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_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_warn_if_reached() pclog("TinyGLib g_warn_if_reached()\n")
#define g_warning(s, ...) tinyglib_pclog("g_warning", s, ##__VA_ARGS__) #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_rand_free free
#define g_realloc realloc #define g_realloc realloc
#define g_snprintf snprintf #define g_snprintf snprintf
#define g_strdup(str) str ? strdup(str) : NULL
#define g_strerror strerror #define g_strerror strerror
#define g_strfreev free #define g_strfreev free
#define g_string_append_printf sprintf /* unimplemented */ #define g_string_append_printf sprintf /* unimplemented */

2
src/win/CMakeLists.txt
View File

@@ -28,6 +28,8 @@ if(MSVC)
# file when using MSVC, so we might just as well do that! # file when using MSVC, so we might just as well do that!
target_compile_definitions(ui PRIVATE NO_INCLUDE_MANIFEST) target_compile_definitions(ui PRIVATE NO_INCLUDE_MANIFEST)
target_sources(86Box PRIVATE 86Box.manifest) target_sources(86Box PRIVATE 86Box.manifest)
target_sources(plat PRIVATE win_opendir.c)
endif() endif()
if(DINPUT) if(DINPUT)

2
src/win/win_opendir.c
View File

@@ -124,7 +124,7 @@ closedir(DIR *p)
* standard "." and ".." entries. Many applications do assume * standard "." and ".." entries. Many applications do assume
* this anyway, so we simply fake these entries. * this anyway, so we simply fake these entries.
*/ */
struct direct * struct dirent *
readdir(DIR *p) readdir(DIR *p)
{ {
FINDATA *ffp; FINDATA *ffp;