kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* include/ruby/win32.h (fstati64): fix macro conflicts.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-03-22 11:47:19 +00:00
parent ff075693c9
commit 3d22e33a06
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/ruby/win32.h
View file

@ -150,7 +150,7 @@ extern DWORD rb_w32_osid(void);
#define getppid() rb_w32_getppid() #define getppid() rb_w32_getppid()
#define sleep(x) rb_w32_Sleep((x)*1000) #define sleep(x) rb_w32_Sleep((x)*1000)
#define Sleep(msec) (void)rb_w32_Sleep(msec) #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__ #ifdef __BORLANDC__
#define creat(p, m) _creat(p, m) #define creat(p, m) _creat(p, m)
#define eof() _eof() #define eof() _eof()
@ -185,7 +185,7 @@ extern DWORD rb_w32_osid(void);
#if SIZEOF_OFF_T == 8 #if SIZEOF_OFF_T == 8
#define off_t __int64 #define off_t __int64
#define stat stati64 #define stat stati64
#define fstat(fd,st) _fstati64(fd,st) #define fstat(fd,st) fstati64(fd,st)
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#define stati64(path, st) rb_w32_stati64(path, st) #define stati64(path, st) rb_w32_stati64(path, st)
#elif !defined(_MSC_VER) || RT_VER < 80 #elif !defined(_MSC_VER) || RT_VER < 80
@ -196,7 +196,6 @@ extern DWORD rb_w32_osid(void);
#else #else
#define stati64 _stat64 #define stati64 _stat64
#define _stat64(path, st) rb_w32_stati64(path, st) #define _stat64(path, st) rb_w32_stati64(path, st)
#define _fstati64 _fstat64
#endif #endif
#else #else
#define stat(path,st) rb_w32_stat(path,st) #define stat(path,st) rb_w32_stat(path,st)