ruby-changes:8153
From: yugui <ko1@a...>
Date: Sat, 4 Oct 2008 22:48:46 +0900 (JST)
Subject: [ruby-changes:8153] Ruby:r19681 (trunk): * dln.c: Ruby no longer supports Windows CE.
yugui 2008-10-04 22:48:20 +0900 (Sat, 04 Oct 2008) New Revision: 19681 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19681 Log: * 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. Removed directories: trunk/wince/ Modified files: trunk/ChangeLog trunk/dln.c trunk/eval.c trunk/ext/tk/extconf.rb trunk/include/ruby/defines.h trunk/include/ruby/win32.h trunk/lib/fileutils.rb trunk/ruby.c trunk/strftime.c trunk/test/fileutils/test_fileutils.rb trunk/win32/Makefile.sub trunk/win32/win32.c Index: include/ruby/defines.h =================================================================== --- include/ruby/defines.h (revision 19680) +++ include/ruby/defines.h (revision 19681) @@ -105,10 +105,8 @@ #if defined(_WIN32) || defined(__EMX__) #define DOSISH 1 -#ifndef _WIN32_WCE # define DOSISH_DRIVE_LETTER #endif -#endif #if defined(__NeXT__) || defined(__APPLE__) /* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may Index: include/ruby/win32.h =================================================================== --- include/ruby/win32.h (revision 19680) +++ include/ruby/win32.h (revision 19681) @@ -33,11 +33,6 @@ #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 @@ -164,7 +159,7 @@ #undef execv #define execv(path,argv) rb_w32_aspawn(P_OVERLAY,path,argv) -#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) +#if !defined(__BORLANDC__) #undef isatty #define isatty(h) rb_w32_isatty(h) #endif @@ -265,7 +260,7 @@ extern int fcntl(int, int, ...); extern rb_pid_t rb_w32_getpid(void); extern rb_pid_t rb_w32_getppid(void); -#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) +#if !defined(__BORLANDC__) extern int rb_w32_isatty(int); #endif extern int rb_w32_mkdir(const char *, int); Index: ChangeLog =================================================================== --- ChangeLog (revision 19680) +++ ChangeLog (revision 19681) @@ -1,3 +1,29 @@ +Sat Oct 4 22:44:23 2008 Yuki Sonoda (Yugui) <yugui@y...> + + * 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. + Sat Oct 4 22:35:06 2008 Yuki Sonoda (Yugui) <yugui@y...> * dln.c: Ruby no longer supports MacOS 9 or before. Index: lib/fileutils.rb =================================================================== --- lib/fileutils.rb (revision 19680) +++ lib/fileutils.rb (revision 19681) @@ -524,7 +524,7 @@ OPT_TABLE['move'] = [:force, :noop, :verbose, :secure] def rename_cannot_overwrite_file? #:nodoc: - /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM + /cygwin|mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM end private_module_function :rename_cannot_overwrite_file? @@ -1041,7 +1041,7 @@ private def fu_windows? - /mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM + /mswin|mingw|bccwin|emx/ =~ RUBY_PLATFORM end def fu_copy_stream0(src, dest, blksize = nil) #:nodoc: Index: win32/win32.c =================================================================== --- win32/win32.c (revision 19680) +++ win32/win32.c (revision 19681) @@ -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 @@ // Initialize Winsock StartSockets(); - -#ifdef _WIN32_WCE - // free commandline buffer - wce_FreeCommandLine(); -#endif } char * @@ -1698,7 +1686,7 @@ #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 @@ 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 @@ 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 @@ 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 @@ return ret; } -#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) +#if !defined(__BORLANDC__) int rb_w32_isatty(int fd) { Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 19680) +++ win32/Makefile.sub (revision 19681) @@ -373,9 +373,7 @@ #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 @@ !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 @@ #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 @@ 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 @@ @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_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) Index: eval.c =================================================================== --- eval.c (revision 19680) +++ eval.c (revision 19681) @@ -31,8 +31,6 @@ #if defined(__APPLE__) #define environ (*_NSGetEnviron()) -#elif !defined(_WIN32) && defined(_WIN32_WCE) -extern char **environ; #endif char **rb_origenviron; Index: strftime.c =================================================================== --- strftime.c (revision 19680) +++ strftime.c (revision 19681) @@ -57,7 +57,7 @@ #include <sys/types.h> #include <errno.h> #endif -#if defined(TM_IN_SYS_TIME) || !defined(GAWK) && !defined(_WIN32_WCE) +#if defined(TM_IN_SYS_TIME) || !defined(GAWK) #include <sys/types.h> #if HAVE_SYS_TIME_H #include <sys/time.h> Index: dln.c =================================================================== --- dln.c (revision 19680) +++ dln.c (revision 19681) @@ -1105,15 +1105,6 @@ #include <windows.h> #endif -#ifdef _WIN32_WCE -#undef FormatMessage -#define FormatMessage FormatMessageA -#undef LoadLibrary -#define LoadLibrary LoadLibraryA -#undef GetProcAddress -#define GetProcAddress GetProcAddressA -#endif - static const char * dln_strerror(void) { Index: ext/tk/extconf.rb =================================================================== --- ext/tk/extconf.rb (revision 19680) +++ ext/tk/extconf.rb (revision 19681) @@ -2,7 +2,7 @@ require 'mkmf' -is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM) +is_win32 = (/mswin|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM) #is_macosx = (/darwin/ =~ RUBY_PLATFORM) have_func("ruby_native_thread_p", "ruby.h") Index: ruby.c =================================================================== --- ruby.c (revision 19680) +++ ruby.c (revision 19681) @@ -15,10 +15,6 @@ #include <windows.h> #include <sys/cygwin.h> #endif -#ifdef _WIN32_WCE -#include <winsock.h> -#include "ruby/wince.h" -#endif #include "ruby/ruby.h" #include "ruby/encoding.h" #include "eval_intern.h" Index: test/fileutils/test_fileutils.rb =================================================================== --- test/fileutils/test_fileutils.rb (revision 19680) +++ test/fileutils/test_fileutils.rb (revision 19681) @@ -20,7 +20,7 @@ end def have_file_perm? - /mswin|mingw|bcc|wince|emx/ !~ RUBY_PLATFORM + /mswin|mingw|bcc|emx/ !~ RUBY_PLATFORM end $fileutils_rb_have_symlink = nil -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/