[前][次][番号順一覧][スレッド一覧]

ruby-changes:23060

From: nobu <ko1@a...>
Date: Thu, 22 Mar 2012 20:47:28 +0900 (JST)
Subject: [ruby-changes:23060] nobu:r35110 (trunk): * include/ruby/win32.h (fstati64): fix macro conflicts.

nobu	2012-03-22 20:47:19 +0900 (Thu, 22 Mar 2012)

  New Revision: 35110

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35110

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

  Modified files:
    trunk/include/ruby/win32.h

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 35109)
+++ include/ruby/win32.h	(revision 35110)
@@ -150,7 +150,7 @@
 #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 @@
 #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 @@
 #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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]