diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-22 11:47:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-22 11:47:19 +0000 |
| commit | 3d22e33a0636eaf4ea659372b59c3f98fb247b7c (patch) | |
| tree | 0b50effc29548190208499fe75c38bc9dd17cae4 /include | |
| parent | ff075693c9038cdd666676a5d55e0bbccaaa8a2b (diff) | |
| download | ruby-3d22e33a0636eaf4ea659372b59c3f98fb247b7c.tar.gz | |
* include/ruby/win32.h (fstati64): fix macro conflicts.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/win32.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 656f564f6d..d16010ceb1 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -150,7 +150,7 @@ extern DWORD rb_w32_osid(void); #define getppid() rb_w32_getppid() #define sleep(x) rb_w32_Sleep((x)*1000) #define Sleep(msec) (void)rb_w32_Sleep(msec) -#define _fstati64(fd,st) rb_w32_fstati64(fd,st) +#define fstati64(fd,st) rb_w32_fstati64(fd,st) #ifdef __BORLANDC__ #define creat(p, m) _creat(p, m) #define eof() _eof() @@ -185,7 +185,7 @@ extern DWORD rb_w32_osid(void); #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 @@ -196,7 +196,6 @@ extern DWORD rb_w32_osid(void); #else #define stati64 _stat64 #define _stat64(path, st) rb_w32_stati64(path, st) -#define _fstati64 _fstat64 #endif #else #define stat(path,st) rb_w32_stat(path,st) |