summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authoruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 03:18:08 +0000
committeruema2 <uema2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-12-15 03:18:08 +0000
commitb19e36a214a864572baee3643ddb369cfeb94d77 (patch)
tree5bd7fecbef75dd74f4810cda212bf989f43a95a3 /util.c
parentc476b6e05c1cae6de5d24b823e676566ae27de6c (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 'util.c')
-rw-r--r--util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/util.c b/util.c
index 14e3c42..345869e 100644
--- a/util.c
+++ b/util.c
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <errno.h>
-#if defined(NT) || defined(_WIN32_WCE)
+#ifdef _WIN32
#include "missing/file.h"
#endif
@@ -75,11 +75,11 @@ scan_hex(start, len, retlen)
# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
-#if defined(NT) || defined(_WIN32_WCE)
+#ifdef _WIN32
#include "missing/file.h"
#endif
-#if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT) || defined(_WIN32_WCE)
+#if defined(MSDOS) || defined(__CYGWIN32__) || defined(_WIN32)
/*
* Copyright (c) 1993, Intergraph Corporation
*
@@ -173,7 +173,7 @@ ruby_add_suffix(str, suffix)
rb_fatal("Cannot do inplace edit on long filename (%ld characters)",
RSTRING(str)->len);
-#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) || defined(_WIN32_WCE)
+#if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32)
/* Style 0 */
slen = RSTRING(str)->len;
rb_str_cat(str, suffix, extlen);
@@ -229,7 +229,7 @@ fallback:
memcpy(RSTRING(str)->ptr, buf, RSTRING(str)->len);
}
-#if defined(__CYGWIN32__) || defined(NT) || defined(_WIN32_WCE)
+#if defined(__CYGWIN32__) || defined(_WIN32)
static int
valid_filename(char *s)
{