diff options
| author | uema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-15 03:18:08 +0000 |
|---|---|---|
| committer | uema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-12-15 03:18:08 +0000 |
| commit | b19e36a214a864572baee3643ddb369cfeb94d77 (patch) | |
| tree | 5bd7fecbef75dd74f4810cda212bf989f43a95a3 /ext | |
| parent | c476b6e05c1cae6de5d24b823e676566ae27de6c (diff) | |
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/Win32API/Win32API.c | 2 | ||||
| -rw-r--r-- | ext/socket/getaddrinfo.c | 2 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 4 | ||||
| -rw-r--r-- | ext/socket/socket.c | 6 | ||||
| -rw-r--r-- | ext/tcltklib/stubs.c | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c index d61b9c7ac0..ee9a1e0569 100644 --- a/ext/Win32API/Win32API.c +++ b/ext/Win32API/Win32API.c @@ -2,7 +2,7 @@ Win32API - Ruby Win32 API Import Facility */ -#if !defined _MSC_VER && !defined NT +#if !defined _MSC_VER && !defined _WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <stdio.h> diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 06daa7cca2..a6c26a8f0f 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -40,7 +40,7 @@ #include "config.h" #include <sys/types.h> -#ifndef NT +#ifndef _WIN32 #include <sys/param.h> #if defined(__BEOS__) # include <net/socket.h> diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index b8a1e310a3..a1fa5d7908 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -36,7 +36,7 @@ #include "config.h" #include <sys/types.h> -#ifndef NT +#ifndef _WIN32 #if defined(__BEOS__) # include <net/socket.h> #else @@ -54,7 +54,7 @@ #include <resolv.h> #endif #endif -#ifdef NT +#ifdef _WIN32 #include <winsock2.h> #include <stdio.h> #define snprintf _snprintf diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 54dbaaf5f2..8378368313 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -24,7 +24,7 @@ #include <sys/uio.h> #endif -#ifndef NT +#ifndef _WIN32 #if defined(__BEOS__) # include <net/socket.h> #else @@ -903,7 +903,7 @@ init_inetsock_internal(arg) } arg->fd = fd; if (type == INET_SERVER) { -#ifndef NT +#ifndef _WIN32 status = 1; setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&status, sizeof(status)); @@ -1816,7 +1816,7 @@ static VALUE sock_s_socketpair(klass, domain, type, protocol) VALUE klass, domain, type, protocol; { -#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__) +#if !defined(_WIN32) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__) int d, t, sp[2]; setup_domain_and_type(domain, &d, type, &t); diff --git a/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c index 80b8bd7167..f394d6fc74 100644 --- a/ext/tcltklib/stubs.c +++ b/ext/tcltklib/stubs.c @@ -41,7 +41,7 @@ ruby_tcltk_stubs() char tk_name[20]; ruby_tcl_dll = getenv("RUBY_TCL_DLL"); -#if defined NT +#if defined _WIN32 if (ruby_tcl_dll) ruby_tcl_dll = ruby_strdup(ruby_tcl_dll); #endif ruby_tk_dll = getenv("RUBY_TK_DLL"); @@ -62,7 +62,7 @@ ruby_tcltk_stubs() } } -#if defined NT +#if defined _WIN32 if (ruby_tcl_dll) ruby_xfree(ruby_tcl_dll); #endif |