From 933e5e091106a83dd8f7c402e02703c183f644ee Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 1 Aug 2010 00:12:51 +0000 Subject: [PATCH] * include/ruby/win32.h: latest x86_64 mingw defines stati64. [ruby-core:27516] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/win32.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index bd68e2ac79..40233e1c25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 1 09:12:50 2010 Nobuyoshi Nakada + + * include/ruby/win32.h: latest x86_64 mingw defines stati64. + [ruby-core:27516] + Sun Aug 1 08:51:52 2010 Masaki Suketa * ext/win32ole/win32ole.c: fix typo. [ruby-core:31564][Bug #3636] diff --git a/include/ruby/win32.h b/include/ruby/win32.h index b9299883bc..b72884affd 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -183,7 +183,9 @@ extern DWORD rb_w32_osid(void); #define stati64(path, st) rb_w32_stati64(path, st) #elif !defined(_MSC_VER) || RT_VER < 80 #define stati64 _stati64 +#ifndef _stati64 #define _stati64(path, st) rb_w32_stati64(path, st) +#endif #else #define stati64 _stat64 #define _stat64(path, st) rb_w32_stati64(path, st)