[ruby-dev:4294] patch for mswin32 (2)

木村です。

お約束通りというか何というか、しっかりケアレスミスしてました^^;

今朝のファイル更新後の状態に使う差分です。win32.hで行の入れ換え
があったりしますので気をつけてください > まつもとさん

更新対象は defines.h、win32/config.h、 win32/win32.[ch] の四つで
す。

diff -u2b define.h.orig define.h
--- defines.h.orig	Tue Dec 22 18:01:50 1998
+++ defines.h	Wed Jan 20 21:16:48 1999
@@ -32,5 +32,5 @@
 
 #ifdef NT
-#include "missing/nt.h"
+#include "win32/win32.h"
 #endif
 
diff -u2b win32/config.h.orig win32/config.h
--- win32/config.h.orig	Thu Dec 24 13:44:12 1998
+++ win32/config.h	Wed Jan 20 14:33:18 1999
@@ -28,5 +28,5 @@
 #define HAVE_FMOD 1
 /* #define HAVE_RANDOM 1    */
-/* #define HAVE_WAITPID 1   */
+#define HAVE_WAITPID 1
 #define HAVE_GETCWD 1
 /* #define HAVE_TRUNCATE 1  */
@@ -38,4 +38,6 @@
 #define HAVE_GETGROUPS 1
 /* #define HAVE_SIGPROCMASK 1 */
+#define HAVE_GETLOGIN 1
+
 #define RSHIFT(x,y) ((x)>>y)
 #define FILE_COUNT _cnt
@@ -45,26 +47,2 @@
 #define RUBY_PLATFORM "i386-mswin32"
 
-/* NNN */
-#define strcasecmp _strcmpi
-#define popen _popen
-#define pclose _pclose
-#define pipe   _pipe
-#define bzero(x, y) memset(x, 0, y)
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-
-
-#define S_IFMT   _S_IFMT
-#define S_IFDIR  _S_IFDIR
-#define S_IFCHR  _S_IFCHR
-#define S_IFREG  _S_IFREG
-#define S_IREAD  _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC  _S_IEXEC
-#define S_IFIFO  _S_IFIFO
-
-#define UIDTYPE int
-#define GIDTYPE int
-#define pid_t   int
-#define WNOHANG -1
-//#define NT
diff -u2b win32/win32.c.orig win32/win32.c
--- win32/win32.c.orig	Thu Dec 24 13:44:12 1998
+++ win32/win32.c	Wed Jan 20 21:21:16 1999
@@ -24,5 +24,5 @@
 #include <winbase.h>
 #include <wincon.h>
-#include "nt.h"
+#include "win32.h"
 #include "dir.h"
 #ifndef index
diff -u2b win32/win32.h.orig win32/win32.h
--- win32/win32.h.orig	Tue Jan 19 00:47:02 1999
+++ win32/win32.h	Wed Jan 20 21:21:04 1999
@@ -99,6 +99,20 @@
 // Grrr...
 //
+#define S_IFMT   _S_IFMT
+#define S_IFDIR  _S_IFDIR
+#define S_IFCHR  _S_IFCHR
+#define S_IFREG  _S_IFREG
+#define S_IREAD  _S_IREAD
+#define S_IWRITE _S_IWRITE
+#define S_IEXEC  _S_IEXEC
+#define S_IFIFO  _S_IFIFO
+
+#define UIDTYPE int
+#define GIDTYPE int
+#define pid_t   int
+#define WNOHANG -1
 
 #define access	   _access
+#define bzero(x, y) memset(x, 0, y)
 #define chmod	   _chmod
 #define chsize	   _chsize
@@ -114,4 +128,8 @@
 #define mktemp	   _mktemp
 #define open	   _open
+#define pclose     _pclose
+#define perror     _perror
+#define pipe       _pipe
+#define popen      _popen
 #define read	   _read
 #define setmode    _setmode
@@ -130,4 +148,6 @@
 #define execvpe    _execvpe
 #define getpid	   _getpid
+#define sleep(x)   Sleep((x)*1000)
+#define snprintf   _snprintf
 #define spawnl	   _spawnl
 #define spawnle    _spawnle
@@ -139,27 +159,9 @@
 #define spawnvpe   _spawnvpe
 #define strcasecmp _strcmpi
-#define popen _popen
-#define pclose _pclose
-#define pipe   _pipe
-#define bzero(x, y) memset(x, 0, y)
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
-
 #if _MSC_VER < 800
 #define fileno	   _fileno
 #endif
 #define utime      _utime
-//#define pipe       _pipe
-#define perror      _perror
-
-#define S_IFMT   _S_IFMT
-#define S_IFDIR  _S_IFDIR
-#define S_IFCHR  _S_IFCHR
-#define S_IFREG  _S_IFREG
-#define S_IREAD  _S_IREAD
-#define S_IWRITE _S_IWRITE
-#define S_IEXEC  _S_IEXEC
-#define S_IFIFO  _S_IFIFO
-
+#define vsnprintf  _vsnprintf
 
 /* these are defined in nt.c */
@@ -204,12 +206,5 @@
 // stubs
 //
-// extern int       ioctl (int, unsigned int, char *);
 extern int       ioctl (int, unsigned int, long);
-#if 0
-extern void      sleep (unsigned int);
-#else
-#define sleep(x) Sleep(x*1000)
-#endif
-
 extern UIDTYPE   getuid (void);
 extern UIDTYPE   geteuid (void);
@@ -232,9 +227,4 @@
 #define PIPE_BUF 1024
 
-#define HAVE_STDLIB_H 1
-#define HAVE_GETLOGIN 1
-#define HAVE_WAITPID 1
-#define HAVE_GETCWD 1
-
 #define LOCK_SH 1
 #define LOCK_EX 2
@@ -245,5 +235,7 @@
 #endif
 
+#ifndef O_BINARY
 #define O_BINARY 0x8000
+#endif
 
 #ifdef popen



-- 
木村浩一
	     May the source be with you.
	mail:     [e-mail]
	web-page: http://www.kt.rim.or.jp/~kbk/