diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-08 05:59:43 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-08 05:59:43 +0000 |
| commit | 7b4486c87774f6318b7bd1cabae5480136357c31 (patch) | |
| tree | 04282446c3de315144bb4567bacf21dd7267e211 | |
| parent | ac0a38e8cf14a9845a175dafce1e047f593e0450 (diff) | |
* merged a patch from Takahiro Kambe <taca@back-street.net> to
support DragonFly BSD. [ruby-dev:26984]
* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
description. [ruby-dev:26965]
* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
mode (-v/-w); backported from 1.9. [ruby-dev:26963]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ext/pty/pty.c | 2 | ||||
| -rw-r--r-- | ext/sdbm/_sdbm.c | 2 | ||||
| -rw-r--r-- | missing/strchr.c | 4 | ||||
| -rw-r--r-- | object.c | 11 | ||||
| -rw-r--r-- | process.c | 6 |
6 files changed, 27 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * merged a patch from Takahiro Kambe <taca@back-street.net> to + support DragonFly BSD. [ruby-dev:26984] + Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org> * lib/open-uri.rb: abolish mod === tempfile to avoid a problem @@ -29,6 +34,15 @@ Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be char*. fixed: [ruby-core:05470] +Wed Sep 7 08:32:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org> + + * object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from + sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility + description. [ruby-dev:26965] + + * sprintf.c (rb_f_sprintf): warn "too many argument" on verbose + mode (-v/-w); backported from 1.9. [ruby-dev:26963] + Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/ostruct.rb: a patch from Florian Gross <florgro@gmail.com> diff --git a/ext/pty/pty.c b/ext/pty/pty.c index f2cd871cbd..db072744d6 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -103,8 +103,6 @@ char *MasterDevice = "/dev/pty%s", static char SlaveName[DEVICELEN]; -extern int errno; - #ifndef HAVE_SETEUID # ifdef HAVE_SETREUID # define seteuid(e) setreuid(-1, (e)) diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index d8bfae80b2..d4cf621ea5 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -103,7 +103,7 @@ static int duppair proto((char *, datum)); /* * externals */ -#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ +#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno) extern int errno; #endif diff --git a/missing/strchr.c b/missing/strchr.c index 82f3cc96b0..886d70ede6 100644 --- a/missing/strchr.c +++ b/missing/strchr.c @@ -19,8 +19,10 @@ strrchr(s, c) char *s; int c; { - char *save = 0; + char *save; + if (c == 0) return s + strlen(s); + save = 0; while (*s) { if (*s == c) save = s; @@ -2054,7 +2054,10 @@ rb_obj_ivar_set(obj, iv, val) * class Fred * @@foo = 99 * end - * Fred.class_variable_get(:@foo) #=> 99 + * + * def Fred.foo + * class_variable_get(:@@foo) #=> 99 + * end */ static VALUE @@ -2083,7 +2086,11 @@ rb_mod_cvar_get(obj, iv) * @@foo * end * end - * Fred.class_variable_set(:@foo, 101) #=> 101 + * + * def Fred.foo + * class_variable_set(:@@foo, 101) #=> 101 + * end + * Fred.foo * Fred.new.foo #=> 101 */ @@ -2055,7 +2055,6 @@ static VALUE p_uid_change_privilege(obj, id) VALUE obj, id; { - extern int errno; int uid; check_uid_switch(); @@ -2606,7 +2605,6 @@ static VALUE p_gid_change_privilege(obj, id) VALUE obj, id; { - extern int errno; int gid; check_gid_switch(); @@ -3133,7 +3131,6 @@ static VALUE p_uid_switch(obj) VALUE obj; { - extern int errno; int uid, euid; check_uid_switch(); @@ -3175,7 +3172,6 @@ static VALUE p_uid_switch(obj) VALUE obj; { - extern int errno; int uid, euid; check_uid_switch(); @@ -3246,7 +3242,6 @@ static VALUE p_gid_switch(obj) VALUE obj; { - extern int errno; int gid, egid; check_gid_switch(); @@ -3287,7 +3282,6 @@ static VALUE p_gid_switch(obj) VALUE obj; { - extern int errno; int gid, egid; check_gid_switch(); |