From a8c3540b32d7621c183627d7cc198f4b24798387 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 4 Oct 2008 13:48:20 +0000 Subject: * dln.c: Ruby no longer supports Windows CE. * eval.c: ditto. * include/ruby/defines.h: ditto. * include/ruby/win32.h: ditto. * ruby.c: ditto. * strftime.c: ditto. * win32/Makefile.sub: ditto. * win32/win32.c: ditto. * ext/tk/extconf.rb: ditto. * lib/fileutils.rb: ditto. * test/fileutils/test_fileutils.rb: ditto. * wince/*: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 35 ----------------------------------- win32/win32.c | 26 +++++--------------------- 2 files changed, 5 insertions(+), 56 deletions(-) (limited to 'win32') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index eb296abce8..f5465e2c75 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -373,9 +373,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define FUNC_FASTCALL(x) __fastcall x #define RUBY_EXTERN extern __declspec(dllimport) #define HAVE_DECL_SYS_NERR 1 -!if !defined(WIN32_WCE) #define HAVE_LIMITS_H 1 -!endif #define HAVE_FCNTL_H 1 #define HAVE_SYS_UTIME_H 1 #define HAVE_FLOAT_H 1 @@ -409,9 +407,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !endif #define GETGROUPS_T int #define RETSIGTYPE void -!if !defined(WIN32_WCE) #define HAVE_ALLOCA 1 -!endif #define HAVE_DUP2 1 #define HAVE_MEMCMP 1 #define HAVE_MEMMOVE 1 @@ -444,9 +440,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define HAVE_TIMES 1 #define HAVE_FCNTL 1 #define HAVE_LINK 1 -!if !defined(WIN32_WCE) #define HAVE__SETJMP 1 -!endif #define HAVE_TELLDIR 1 #define HAVE_SEEKDIR 1 #define HAVE_MKTIME 1 @@ -484,29 +478,6 @@ $(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(AR config.h: nul $(BANG)endif #endif -!if defined(WIN32_WCE) -#define GC_MALLOC_LIMIT 4000000 -#define stricmp _stricmp -#define fopen wce_fopen -#define open _open -#define read _read -#define write _write -#define lseek _lseek - -#if _WIN32_WCE < 300 - #define isascii(c) ( (c>=0x00&&c<=0x7f)?1:0 ) - #define isspace(c) ( ((c>=0x09&&c<=0x0d)||c==0x20)?1:0 ) - #define isdigit(c) ( (c>=0x30&&c<=0x39)?1:0 ) - #define isupper(c) ( (c>='A'&&c<='Z')?1:0 ) - #define isalpha(c) ( ((c>='A'&&c<='Z')||(c>='a'&&c<='z'))?1:0 ) - #define isprint(c) ( (c>=0x20&&c<=0x7e)?1:0 ) - #define isalnum(c) ( (isalpha(c)||isdigit(c))?1:0 ) - #define iscntrl(c) ( ((c>=0x00&&c<=0x1f)||c==0x7f)?1:0 ) - #define islower(c) ( (c>='a'&&c<='z')?1:0 ) - #define ispunct(c) ( !(isalnum(c)||isspace(c))?1:0 ) - #define isxdigit(c) ( ((c>=0&&c<=9)||(c>='A'&&c<='F')||(c>='a'&&c<='f'))?1:0 ) -#endif -!endif << @exit > $(@:/=\) @@ -529,9 +500,6 @@ config.status: $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.su @exit <<$@ # Generated automatically by Makefile.sub. s,@SHELL@,$$(COMSPEC),;t t -!if defined(WIN32_WCE) -s,@MAIN_DOES_NOTHING@,int WinMain(HINSTANCE h, HINSTANCE hp, LPWSTR s, int n) {return 0;},;t t -!endif s,@BUILD_FILE_SEPARATOR@,\,;t t s,@PATH_SEPARATOR@,;,;t t s,@CFLAGS@,$(CFLAGS),;t t @@ -733,9 +701,6 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) -ruby_name=$(RUBY_INSTALL_NAME) \ -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ -!if defined(WIN32_WCE) - -wce_ver=$(SUBSYSVERSION) \ -!endif . $(icondirs) $(win_srcdir) fake.rb: $(MKFILES) diff --git a/win32/win32.c b/win32/win32.c index bcf4bd77ea..b0db5f40b8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -33,9 +33,6 @@ #endif #include "ruby/win32.h" #include "win32/dir.h" -#ifdef _WIN32_WCE -#include "wince.h" -#endif #ifndef index #define index(x, y) strchr((x), (y)) #endif @@ -46,7 +43,7 @@ #undef close #undef setsockopt -#if defined __BORLANDC__ || defined _WIN32_WCE +#if defined __BORLANDC__ # define _filbuf _fgetc # define _flsbuf _fputc # define enough_to_get(n) (--(n) >= 0) @@ -67,11 +64,7 @@ static struct ChildRecord *CreateChild(const char *, const char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE); static int has_redirection(const char *); int rb_w32_wait_events(HANDLE *events, int num, DWORD timeout); -#if !defined(_WIN32_WCE) static int rb_w32_open_osfhandle(intptr_t osfhandle, int flags); -#else -#define rb_w32_open_osfhandle(osfhandle, flags) _open_osfhandle(osfhandle, flags) -#endif #define RUBY_CRITICAL(expr) do { expr; } while (0) @@ -508,11 +501,6 @@ rb_w32_sysinit(int *argc, char ***argv) // Initialize Winsock StartSockets(); - -#ifdef _WIN32_WCE - // free commandline buffer - wce_FreeCommandLine(); -#endif } char * @@ -1698,7 +1686,7 @@ typedef struct { #define _CRTIMP __declspec(dllimport) #endif -#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) +#if !defined(__BORLANDC__) EXTERN_C _CRTIMP ioinfo * __pioinfo[]; #define IOINFO_L2E 5 @@ -3759,7 +3747,7 @@ catch_interrupt(void) RUBY_CRITICAL(rb_w32_wait_events(NULL, 0, 0)); } -#if defined __BORLANDC__ || defined _WIN32_WCE +#if defined __BORLANDC__ #undef read int read(int fd, void *buf, size_t size) @@ -3779,15 +3767,13 @@ int rb_w32_getc(FILE* stream) { int c; -#ifndef _WIN32_WCE if (enough_to_get(stream->FILE_COUNT)) { c = (unsigned char)*stream->FILE_READPTR++; } else -#endif { c = _filbuf(stream); -#if defined __BORLANDC__ || defined _WIN32_WCE +#if defined __BORLANDC__ if ((c == EOF) && (errno == EPIPE)) { clearerr(stream); } @@ -3801,12 +3787,10 @@ rb_w32_getc(FILE* stream) int rb_w32_putc(int c, FILE* stream) { -#ifndef _WIN32_WCE if (enough_to_put(stream->FILE_COUNT)) { c = (unsigned char)(*stream->FILE_READPTR++ = (char)c); } else -#endif { c = _flsbuf(c, stream); catch_interrupt(); @@ -4673,7 +4657,7 @@ rb_w32_unlink(const char *path) return ret; } -#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) +#if !defined(__BORLANDC__) int rb_w32_isatty(int fd) { -- cgit v1.2.3