From 1f3a385ec5ff6b507ea98904568cafc9a330f0aa Mon Sep 17 00:00:00 2001
From: mimaki <hiroshi.mimaki@gmail.com>
Date: Tue, 28 Dec 2021 17:18:59 +0900
Subject: Fix build error and refine definition of `ssize_t` on MSVC.

---
 include/mruby/common.h            | 5 +++++
 mrbgems/mruby-io/src/io.c         | 6 ------
 mrbgems/mruby-socket/src/socket.c | 3 ---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/include/mruby/common.h b/include/mruby/common.h
index 90c97cf65..c5cfaeb50 100644
--- a/include/mruby/common.h
+++ b/include/mruby/common.h
@@ -28,6 +28,11 @@
 # define MRB_END_DECL
 #endif
 
+#if defined _MSC_VER
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 /**
  * Shared compiler macros
  */
diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c
index 8261cf998..765dc9051 100644
--- a/mrbgems/mruby-io/src/io.c
+++ b/mrbgems/mruby-io/src/io.c
@@ -34,12 +34,6 @@
   typedef long fsuseconds_t;
   typedef int fmode_t;
   typedef int mrb_io_read_write_size;
-  #ifndef MRB_MINGW32_LEGACY
-    #if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED) && \
-        !defined(__have_typedef_ssize_t)
-    typedef SSIZE_T ssize_t;
-    #endif
-  #endif
 
   #ifndef O_TMPFILE
     #define O_TMPFILE O_TEMPORARY
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index 027404459..f0213ad39 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -13,9 +13,6 @@
   #include <winerror.h>
 
   #define SHUT_RDWR SD_BOTH
-  #ifndef _SSIZE_T_DEFINED
-  typedef int ssize_t;
-  #endif
   typedef int fsize_t;
 #else
   #include <sys/types.h>
-- 
cgit v1.2.3