admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4938 from dearblue/socket-mingw

Browse Source 
Fix builds for old mingw in mruby-socket; ref #4914
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-02-01 17:41:19 +09:00
committed by GitHub
parent db64bd42d3 8020374d6b
commit 3c67d9b1c0
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/common.h
+10
View File
@@ -74,6 +74,16 @@ MRB_BEGIN_DECL
#endif
#endif
/** Declare mingw versions */
#if defined(__MINGW32__) || defined(__MINGW64__)
# include <_mingw.h>
# if defined(__MINGW64_VERSION_MAJOR)
# define MRB_MINGW64_VERSION (__MINGW64_VERSION_MAJOR * 1000 + __MINGW64_VERSION_MINOR)
# elif defined(__MINGW32_MAJOR_VERSION)
# define MRB_MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 1000 + __MINGW32_MINOR_VERSION)
# endif
#endif
MRB_END_DECL
#endif /* MRUBY_COMMON_H */
mrbgems/mruby-io/test/mruby_io_test.c
+1 -6
View File
@@ -1,3 +1,4 @@
#include <mruby/common.h>
#include <sys/types.h>
#include <errno.h>
@@ -18,12 +19,6 @@ typedef int mode_t;
#define open _open
#define close _close
#if defined(__MINGW64_VERSION_MAJOR)
# define MRB_MINGW64_VERSION (__MINGW64_VERSION_MAJOR * 1000 + __MINGW64_VERSION_MINOR)
#elif defined(__MINGW32_MAJOR_VERSION)
# define MRB_MINGW32_VERSION (__MINGW32_MAJOR_VERSION * 1000 + __MINGW32_MINOR_VERSION)
#endif
#if defined(_MSC_VER) || \
(defined(MRB_MINGW32_VERSION) && MRB_MINGW32_VERSION < 3021) || \
(defined(MRB_MINGW64_VERSION) && MRB_MINGW64_VERSION < 4000)
mrbgems/mruby-socket/test/sockettest.c
+3 -1
View File
@@ -8,7 +8,9 @@
#include <io.h>
#ifdef _MSC_VER
#if defined(_MSC_VER) || \
(defined(MRB_MINGW32_VERSION) && MRB_MINGW32_VERSION < 3021) || \
(defined(MRB_MINGW64_VERSION) && MRB_MINGW64_VERSION < 4000)
#include <fcntl.h>
#include <sys/stat.h>