32 lines
818 B
Diff
32 lines
818 B
Diff
--- ruby-2.1.4/include/ruby/win32.h.orig 2014-10-28 08:58:50.765200000 +0300
|
|
+++ ruby-2.1.4/include/ruby/win32.h 2014-10-28 08:59:10.639600000 +0300
|
|
@@ -753,8 +753,10 @@
|
|
|
|
int rb_w32_times(struct tms *);
|
|
|
|
+#ifndef __MINGW64_VERSION_MAJOR
|
|
struct tm *gmtime_r(const time_t *, struct tm *);
|
|
struct tm *localtime_r(const time_t *, struct tm *);
|
|
+#endif
|
|
|
|
/* thread stuff */
|
|
int rb_w32_sleep(unsigned long msec);
|
|
--- ruby-2.1.4/win32/win32.c.orig 2014-10-28 09:10:00.401400000 +0300
|
|
+++ ruby-2.1.4/win32/win32.c 2014-10-28 09:10:15.486600000 +0300
|
|
@@ -7057,6 +7057,7 @@
|
|
# define localtime_s _localtime64_s
|
|
#endif
|
|
|
|
+#ifndef __MINGW64_VERSION_MAJOR
|
|
/* License: Ruby's */
|
|
struct tm *
|
|
gmtime_r(const time_t *tp, struct tm *rp)
|
|
@@ -7104,6 +7105,7 @@
|
|
#endif
|
|
return rp;
|
|
}
|
|
+#endif
|
|
|
|
/* License: Ruby's */
|
|
int
|