[ruby-dev:19123] Re: [ruby-cvs] ruby: * file.c (utimbuf): need to define for VC++.

こんにちは、なかむら(う)です。
# とりあえず、順番に

In message "[ruby-dev:19093] Re: [ruby-cvs] ruby: * file.c (utimbuf): need to define for VC++."
    on Dec.17,2002 13:52:01, <[e-mail]> wrote:
> | というわけで、oldnameで統一するほうがよさそうです。
> 
> というわけで、了解です。

やってみました。が、

* mingw32版は手元の環境が壊れてしまって手を付けられず
* wince版はまだ環境を用意していないので手を付けられず

というわけで、mswin32版のみ対応のパッチです。
bccwin32版には影響ないはずですが、いちおうmake testまでは確
認しました。

Index: file.c
===================================================================
RCS file: /home/cvs/ruby/file.c,v
retrieving revision 1.120
diff -u -1 -p -r1.120 file.c
--- file.c	2002/12/19 09:20:19	1.120
+++ file.c	2002/12/19 14:36:04
@@ -1203,5 +1203,2 @@ struct utimbuf {
 #endif
-#if defined(_WIN32) && !defined(_WIN32_WCE)&& (defined(_MSC_VER) || defined(__MINGW__))
-# define utimbuf _utimbuf
-#endif
 
Index: win32/Makefile.sub
===================================================================
RCS file: /home/cvs/ruby/win32/Makefile.sub,v
retrieving revision 1.33
diff -u -1 -p -r1.33 Makefile.sub
--- win32/Makefile.sub	2002/12/15 03:18:08	1.33
+++ win32/Makefile.sub	2002/12/19 14:36:05
@@ -94,3 +94,3 @@ EXTLIBS =
 !endif
-LIBS = user32.lib advapi32.lib wsock32.lib $(EXTLIBS)
+LIBS = oldnames.lib user32.lib advapi32.lib wsock32.lib $(EXTLIBS)
 MISSING = acosh.obj crypt.obj win32.obj isinf.obj isnan.obj
@@ -606,3 +606,3 @@ parse.obj: {$(srcdir)}parse.c {$(srcdir)
   {$(srcdir)}env.h {$(srcdir)}node.h {$(srcdir)}st.h {$(srcdir)}regex.h \
-  {$(srcdir)}util.h {$(srcdir)}lex.c
+  {$(srcdir)}util.h {$(srcdir)}lex.c {$(srcdir)}/win32/win32.h
 prec.obj: {$(srcdir)}prec.c {$(srcdir)}ruby.h config.h \
Index: win32/win32.c
===================================================================
RCS file: /home/cvs/ruby/win32/win32.c,v
retrieving revision 1.75
diff -u -1 -p -r1.75 win32.c
--- win32/win32.c	2002/12/02 07:57:17	1.75
+++ win32/win32.c	2002/12/19 14:36:05
@@ -2324,8 +2324,4 @@ rb_w32_getcwd(buffer, size)
 
-#ifdef __BORLANDC__
 #undef getcwd
     if (getcwd(buffer, size) == NULL) {
-#else
-    if (_getcwd(buffer, size) == NULL) {
-#endif
         return NULL;
Index: win32/win32.h
===================================================================
RCS file: /home/cvs/ruby/win32/win32.h,v
retrieving revision 1.32
diff -u -1 -p -r1.32 win32.h
--- win32/win32.h	2002/12/15 03:18:08	1.32
+++ win32/win32.h	2002/12/19 14:36:05
@@ -100,37 +100,5 @@ extern "C++" {
 
-#ifndef __BORLANDC__
-
-#define access	   _access
-#define chmod	   _chmod
-#define chsize	   _chsize
-#define dup	   _dup
-#define dup2	   _dup2
-#define isatty	   _isatty
-#define open	   _open
-#define setmode    _setmode
-#define execl	   _execl
-#define execle	   _execle
-#define execlp	   _execlp
-#define execlpe    _execlpe
-#define execv	   _execv
-#define execve	   _execve
-#define execvp	   _execvp
-#define execvpe    _execvpe
-#define lseek      _lseek
-#define spawnl	   _spawnl
-#define spawnle    _spawnle
-#define spawnlp    _spawnlp
-#define spawnlpe   _spawnlpe
-#define spawnv	   _spawnv
-#define spawnve    _spawnve
-#define spawnvp    _spawnvp
-#define spawnvpe   _spawnvpe
-#if _MSC_VER < 800
-#define fileno	   _fileno
-#endif
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#else
 #define strcasecmp  stricmp
 #define strncasecmp strnicmp
+#ifdef __BORLANDC__
 #define _open       _sopen
@@ -140,2 +108,5 @@ extern "C++" {
 #define fclose	   rb_w32_fclose
+#define getpid	   rb_w32_getpid
+#define sleep(x)   rb_w32_sleep((x)*1000)
+#ifdef __BORLANDC__
 #define creat	   _creat
@@ -152,5 +123,4 @@ extern "C++" {
 #define write	   _write
-#define getpid	   rb_w32_getpid
-#define sleep(x)   rb_w32_sleep((x)*1000)
 #define utime      _utime
+#endif
 #define vsnprintf  _vsnprintf

それでは。
-- 
U.Nakamura <[e-mail]>