ruby-changes:21288
From: kosaki <ko1@a...>
Date: Mon, 26 Sep 2011 09:19:14 +0900 (JST)
Subject: [ruby-changes:21288] kosaki:r33337 (trunk): * include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody
kosaki 2011-09-26 09:19:03 +0900 (Mon, 26 Sep 2011) New Revision: 33337 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33337 Log: * include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody support. Last activity of their OSs are 7 years ago. * configure.in: ditto. * dir.c: ditto. * ext/tk/extconf.rb: ditto. Modified files: trunk/ChangeLog trunk/configure.in trunk/dir.c trunk/dln.c trunk/ext/tk/extconf.rb trunk/include/ruby/defines.h Index: include/ruby/defines.h =================================================================== --- include/ruby/defines.h (revision 33336) +++ include/ruby/defines.h (revision 33337) @@ -149,76 +149,6 @@ #endif #endif -#ifdef __NeXT__ -/* NextStep, OpenStep, Rhapsody */ -#ifndef S_IRUSR -#define S_IRUSR 0000400 /* read permission, owner */ -#endif -#ifndef S_IRGRP -#define S_IRGRP 0000040 /* read permission, group */ -#endif -#ifndef S_IROTH -#define S_IROTH 0000004 /* read permission, other */ -#endif -#ifndef S_IWUSR -#define S_IWUSR 0000200 /* write permission, owner */ -#endif -#ifndef S_IWGRP -#define S_IWGRP 0000020 /* write permission, group */ -#endif -#ifndef S_IWOTH -#define S_IWOTH 0000002 /* write permission, other */ -#endif -#ifndef S_IXUSR -#define S_IXUSR 0000100 /* execute/search permission, owner */ -#endif -#ifndef S_IXGRP -#define S_IXGRP 0000010 /* execute/search permission, group */ -#endif -#ifndef S_IXOTH -#define S_IXOTH 0000001 /* execute/search permission, other */ -#endif -#ifndef S_IRWXU -#define S_IRWXU 0000700 /* read, write, execute permissions, owner */ -#endif -#ifndef S_IRWXG -#define S_IRWXG 0000070 /* read, write, execute permissions, group */ -#endif -#ifndef S_IRWXO -#define S_IRWXO 0000007 /* read, write, execute permissions, other */ -#endif -#ifndef S_ISBLK -#define S_ISBLK(mode) (((mode) & (0170000)) == (0060000)) -#endif -#ifndef S_ISCHR -#define S_ISCHR(mode) (((mode) & (0170000)) == (0020000)) -#endif -#ifndef S_ISDIR -#define S_ISDIR(mode) (((mode) & (0170000)) == (0040000)) -#endif -#ifndef S_ISFIFO -#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000)) -#endif -#ifndef S_ISREG -#define S_ISREG(mode) (((mode) & (0170000)) == (0100000)) -#endif -#ifndef __APPLE__ -/* NextStep, OpenStep (but not Rhapsody) */ -#ifndef GETPGRP_VOID -#define GETPGRP_VOID 1 -#endif -#ifndef WNOHANG -#define WNOHANG 01 -#endif -#ifndef WUNTRACED -#define WUNTRACED 02 -#endif -#ifndef X_OK -#define X_OK 1 -#endif -#endif /* __APPLE__ */ -#endif /* NeXT */ - #ifdef _WIN32 #include "ruby/win32.h" #endif Index: configure.in =================================================================== --- configure.in (revision 33336) +++ configure.in (revision 33337) @@ -1965,7 +1965,7 @@ AC_MSG_CHECKING(whether OS depend dynamic link works) if test "$GCC" = yes; then AS_CASE(["$target_os"], - [nextstep*|openstep*|rhapsody*|darwin*], [ + [darwin*], [ # The -fno-common is needed if we wish to embed the Ruby interpreter # into a plugin module of some project (as opposed to embedding it # within the project's application). The -I/usr/local/include is @@ -2054,15 +2054,6 @@ LDFLAGS="$LDFLAGS -Wl,-E" fi rb_cv_dlopen=yes], - [nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'} - LDFLAGS="$LDFLAGS -u libsys_s" - rb_cv_dlopen=yes], - [openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} - : ${LDFLAGS=""} - rb_cv_dlopen=yes], - [rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} - : ${LDFLAGS=""} - rb_cv_dlopen=yes], [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"} : ${LDFLAGS=""} @@ -2182,7 +2173,7 @@ AS_CASE(["$target_os"], [hpux*], [ DLEXT=sl], - [nextstep*|openstep*|rhapsody*|darwin*], [ + [darwin*], [ RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend]) DLEXT=bundle], [os2-emx*], [ @@ -2220,7 +2211,7 @@ AS_CASE(["$target_os"], [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [ STRIP="$STRIP -S -x"], - [nextstep* | openstep* | rhapsody* | darwin*], [ + [darwin*], [ STRIP="$STRIP -A -n"]) AC_ARG_WITH(ext, @@ -2288,7 +2279,7 @@ SOLIBS= AS_CASE(["$target_os"], - [cygwin*|mingw*|beos*|haiku*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*], [ + [cygwin*|mingw*|beos*|haiku*|darwin*|os2-emx*], [ : ${DLDLIBS=""} ], [ @@ -2480,12 +2471,6 @@ [netbsd*], [ RUBY_APPEND_OPTION(CFLAGS, -pipe) ], - [nextstep*|openstep*], [ - RUBY_APPEND_OPTION(CPPFLAGS, -I/usr/local/include) - ], - [rhapsody*], [ - RUBY_APPEND_OPTIONS(CFLAGS, -pipe -no-precomp) - ], [darwin*], [ RUBY_APPEND_OPTION(CFLAGS, -pipe) ], Index: ChangeLog =================================================================== --- ChangeLog (revision 33336) +++ ChangeLog (revision 33337) @@ -1,3 +1,11 @@ +Mon Sep 26 09:07:46 2011 KOSAKI Motohiro <kosaki.motohiro@g...> + + * include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody + support. Last activity of their OSs are 7 years ago. + * configure.in: ditto. + * dir.c: ditto. + * ext/tk/extconf.rb: ditto. + Mon Sep 26 09:02:49 2011 KOSAKI Motohiro <kosaki.motohiro@g...> * configure.in: remove a code for human68k. it's no longer Index: dir.c =================================================================== --- dir.c (revision 33336) +++ dir.c (revision 33337) @@ -30,12 +30,7 @@ # define NAMLEN(dirent) strlen((dirent)->d_name) #else # define dirent direct -# if !defined __NeXT__ -# define NAMLEN(dirent) (dirent)->d_namlen -# else -# /* On some versions of NextStep, d_namlen is always zero, so avoid it. */ -# define NAMLEN(dirent) strlen((dirent)->d_name) -# endif +# define NAMLEN(dirent) (dirent)->d_namlen # if HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif Index: dln.c =================================================================== --- dln.c (revision 33336) +++ dln.c (revision 33337) @@ -1383,7 +1383,7 @@ } #endif /* _AIX */ -#if defined(NeXT) || defined(MACOSX_DYLD) +#if defined(MACOSX_DYLD) #define DLN_DEFINED /*---------------------------------------------------- By SHIROYAMA Takayuki Psi@f... @@ -1394,44 +1394,7 @@ sunshine@s..., and... Miss ARAI Akino(^^;) ----------------------------------------------------*/ -#if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */ - { - NXStream* s; - unsigned long init_address; - char *object_files[2] = {NULL, NULL}; - - void (*init_fct)(); - - object_files[0] = (char*)file; - - s = NXOpenFile(2,NX_WRITEONLY); - - /* Load object file, if return value ==0 , load failed*/ - if(rld_load(s, NULL, object_files, NULL) == 0) { - NXFlush(s); - NXClose(s); - dln_loaderror("Failed to load %.200s", file); - } - - /* lookup the initial function */ - if(rld_lookup(s, buf, &init_address) == 0) { - NXFlush(s); - NXClose(s); - dln_loaderror("Failed to lookup Init function %.200s", file); - } - - NXFlush(s); - NXClose(s); - - /* Cannot call *init_address directory, so copy this value to - function pointer */ - init_fct = (void(*)())init_address; - (*init_fct)(); - return (void*)init_address; - } -#else/* OPENSTEP dyld functions */ - { int dyld_result; NSObjectFileImage obj_file; /* handle, but not use it */ /* "file" is module file name . @@ -1457,7 +1420,6 @@ return (void*)init_fct; } -#endif /* rld or dyld */ #endif #if defined(__BEOS__) || defined(__HAIKU__) Index: ext/tk/extconf.rb =================================================================== --- ext/tk/extconf.rb (revision 33336) +++ ext/tk/extconf.rb (revision 33337) @@ -541,7 +541,7 @@ def get_ext_list() exts = [CONFIG['DLEXT']] exts.concat %w(dll lib) if is_win32? - exts.concat %w(bundle dylib) if is_macosx? || /nextstep|openstep|rhapsody/ =~ RUBY_PLATFORM + exts.concat %w(bundle dylib) if is_macosx? if enable_config("shared") == false [CONFIG['LIBEXT'], "a"].concat exts -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/