summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/win32.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e956677c24b..7d2c10fc912 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 30 17:08:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/win32.h (fstat): revert r37337, which uses _fstati64()
+ instead of fstati64() on mingw32. [Bug #7276]
+
Wed Jan 30 15:26:37 2013 Shugo Maeda <shugo@ruby-lang.org>
* ext/socket/unixsocket.c (rsock_init_unixsock): use rb_inspect()
diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index 9645cc888d8..a2eec0cf19b 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -177,7 +177,7 @@ typedef unsigned int uintptr_t;
#if SIZEOF_OFF_T == 8
#define off_t __int64
#define stat stati64
-#define fstat(fd,st) _fstati64(fd,st)
+#define fstat(fd,st) fstati64(fd,st)
#if defined(__BORLANDC__)
#define stati64(path, st) rb_w32_stati64(path, st)
#elif !defined(_MSC_VER) || RT_VER < 80