summaryrefslogtreecommitdiff
path: root/win32
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 /win32
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 'win32')
-rw-r--r--win32/Makefile.sub3
-rw-r--r--win32/win32.h8
2 files changed, 9 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0164910..269e32b 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -78,7 +78,7 @@ prefix = /usr
DESTDIR = $(prefix)
!endif
!if !defined(CFLAGS)
-CFLAGS = -MD -DNT=1 $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
+CFLAGS = -MD $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG)
!endif
!if !defined(CPPFLAGS)
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/missing -DLIBRUBY_SO=\"$(LIBRUBY_SO)\"
@@ -265,7 +265,6 @@ config.h: Makefile $(srcdir)/win32/Makefile.sub
#define DEFAULT_KCODE KCODE_NONE
#define DLEXT ".so"
#define DLEXT2 ".dll"
-#define NT 1
#define RUBY_LIB "/lib/ruby/1.7"
#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/1.7"
diff --git a/win32/win32.h b/win32/win32.h
index 67c054c..41c3a40 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -33,6 +33,14 @@
#include <winsock.h>
#undef OpenFile
#endif
+
+#define NT 1 /* deprecated */
+
+#ifdef _WIN32_WCE
+#undef CharNext
+#define CharNext CharNextA
+#endif
+
//
// We're not using Microsoft's "extensions" to C for
// Structured Exception Handling (SEH) so we can nuke these