ruby-changes:8154
From: yugui <ko1@a...>
Date: Sat, 4 Oct 2008 22:57:24 +0900 (JST)
Subject: [ruby-changes:8154] Ruby:r19682 (trunk): * dln.c: Ruby no longer supports VMS.
yugui 2008-10-04 22:57:06 +0900 (Sat, 04 Oct 2008) New Revision: 19682 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19682 Log: * dln.c: Ruby no longer supports VMS. * error.c: ditto. * eval.c: ditto. * eval_intern.h: ditto. * include/ruby/defines.h: ditto. * include/ruby/ruby.h: ditto. * io.c: ditto. * process.c: ditto. * ruby.c: ditto. * vms/config.h: removed. * vms/vms.h: ditto. * vms/vmsruby_private.c: ditto. * vms/vmsruby_private.h: ditto. Removed directories: trunk/vms/ Modified files: trunk/ChangeLog trunk/dln.c trunk/error.c trunk/eval.c trunk/eval_intern.h trunk/include/ruby/defines.h trunk/include/ruby/ruby.h trunk/io.c trunk/process.c trunk/ruby.c Index: eval_intern.h =================================================================== --- eval_intern.h (revision 19681) +++ eval_intern.h (revision 19682) @@ -64,10 +64,6 @@ #include <net/socket.h> #endif -#ifdef __VMS -#include "vmsruby_private.h" -#endif - #define ruby_setjmp(env) RUBY_SETJMP(env) #define ruby_longjmp(env,val) RUBY_LONGJMP(env,val) #ifdef __CYGWIN__ @@ -78,10 +74,6 @@ #include <signal.h> #include <errno.h> -#if defined(__VMS) -#pragma nostandard -#endif - #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif Index: include/ruby/defines.h =================================================================== --- include/ruby/defines.h (revision 19681) +++ include/ruby/defines.h (revision 19682) @@ -192,10 +192,6 @@ #include "ruby/win32.h" #endif -#if defined(__VMS) -#include "vms/vms.h" -#endif - #if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE) #include <net/socket.h> /* intern.h needs fd_set definition */ #endif @@ -255,7 +251,7 @@ #endif #ifndef CASEFOLD_FILESYSTEM -# if defined DOSISH || defined __VMS +# if defined DOSISH # define CASEFOLD_FILESYSTEM 1 # else # define CASEFOLD_FILESYSTEM 0 Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 19681) +++ include/ruby/ruby.h (revision 19682) @@ -77,11 +77,6 @@ # endif #endif -#if defined(__VMS) -# pragma builtins -# define alloca __alloca -#endif - #if SIZEOF_LONG == SIZEOF_VOIDP typedef unsigned long VALUE; typedef unsigned long ID; Index: ChangeLog =================================================================== --- ChangeLog (revision 19681) +++ ChangeLog (revision 19682) @@ -1,3 +1,31 @@ +Sat Oct 4 22:50:14 2008 Yuki Sonoda (Yugui) <yugui@y...> + + * dln.c: Ruby no longer supports VMS. + + * error.c: ditto. + + * eval.c: ditto. + + * eval_intern.h: ditto. + + * include/ruby/defines.h: ditto. + + * include/ruby/ruby.h: ditto. + + * io.c: ditto. + + * process.c: ditto. + + * ruby.c: ditto. + + * vms/config.h: removed. + + * vms/vms.h: ditto. + + * vms/vmsruby_private.c: ditto. + + * vms/vmsruby_private.h: ditto. + Sat Oct 4 22:44:23 2008 Yuki Sonoda (Yugui) <yugui@y...> * dln.c: Ruby no longer supports Windows CE. Index: io.c =================================================================== --- io.c (revision 19681) +++ io.c (revision 19682) @@ -159,16 +159,10 @@ # define STDIO_READ_DATA_PENDING(fp) ((fp)->FILE_READPTR < (fp)->FILE_READEND) #elif defined(__BEOS__) # define STDIO_READ_DATA_PENDING(fp) (fp->_state._eof == 0) -#elif defined(__VMS) -# define STDIO_READ_DATA_PENDING(fp) (((unsigned int)(*(fp))->_cnt) > 0) #else # define STDIO_READ_DATA_PENDING(fp) (!feof(fp)) #endif -#if defined(__VMS) -#define open(file_spec, flags, mode) open(file_spec, flags, mode, "rfm=stmlf") -#endif - #define GetWriteIO(io) rb_io_get_write_io(io) #define READ_DATA_PENDING(fptr) ((fptr)->rbuf_len) Index: eval.c =================================================================== --- eval.c (revision 19681) +++ eval.c (revision 19682) @@ -61,11 +61,6 @@ PUSH_TAG(); if ((state = EXEC_TAG()) == 0) { rb_call_inits(); - -#if defined(__VMS) - _vmsruby_init(); -#endif - ruby_prog_init(); } POP_TAG(); Index: dln.c =================================================================== --- dln.c (revision 19681) +++ dln.c (revision 19682) @@ -45,7 +45,7 @@ #define free(x) xfree(x) #include <stdio.h> -#if defined(_WIN32) || defined(__VMS) +#if defined(_WIN32) #include "missing/file.h" #endif #include <sys/types.h> @@ -70,11 +70,6 @@ char *getenv(); #endif -#if defined(__VMS) -#pragma builtins -#include <dlfcn.h> -#endif - #if defined(__APPLE__) && defined(__MACH__) /* Mac OS X */ # if defined(HAVE_DLOPEN) /* Mac OS X with dlopen (10.3 or later) */ @@ -1460,35 +1455,6 @@ } #endif /* __BEOS__*/ -#if defined(__VMS) -#define DLN_DEFINED - { - void *handle, (*init_fct)(); - char *fname, *p1, *p2; - - fname = (char *)__alloca(strlen(file)+1); - strcpy(fname,file); - if (p1 = strrchr(fname,'/')) - fname = p1 + 1; - if (p2 = strrchr(fname,'.')) - *p2 = '\0'; - - if ((handle = (void*)dlopen(fname, 0)) == NULL) { - error = dln_strerror(); - goto failed; - } - - if ((init_fct = (void (*)())dlsym(handle, buf)) == NULL) { - error = DLN_ERROR(); - dlclose(handle); - goto failed; - } - /* Call the init code */ - (*init_fct)(); - return handle; - } -#endif /* __VMS */ - #ifndef DLN_DEFINED rb_notimplement(); #endif Index: process.c =================================================================== --- process.c (revision 19681) +++ process.c (revision 19682) @@ -2256,15 +2256,10 @@ int ep[2]; #endif -#ifndef __VMS #define prefork() ( \ rb_io_flush(rb_stdout), \ rb_io_flush(rb_stderr) \ ) -#else -#define prefork() ((void)0) -#endif - prefork(); #ifdef FD_CLOEXEC Index: error.c =================================================================== --- error.c (revision 19681) +++ error.c (revision 19682) @@ -898,7 +898,7 @@ static VALUE syserr_initialize(int argc, VALUE *argv, VALUE self) { -#if !defined(_WIN32) && !defined(__VMS) +#if !defined(_WIN32) char *strerror(); #endif const char *err; Index: ruby.c =================================================================== --- ruby.c (revision 19681) +++ ruby.c (revision 19682) @@ -1404,10 +1404,6 @@ rb_gid_t gid = getgid(); rb_gid_t egid = getegid(); -#ifdef VMS - uid |= gid << 16; - euid |= egid << 16; -#endif if (uid != euid) opt->setids |= 1; if (egid != gid) opt->setids |= 2; if (uid && opt->setids) { -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/