Skip to content

Commit 7b4486c

Browse files
author
matz
committed
* 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
1 parent ac0a38e commit 7b4486c

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
2+
3+
* merged a patch from Takahiro Kambe <taca@back-street.net> to
4+
support DragonFly BSD. [ruby-dev:26984]
5+
16
Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org>
27

38
* 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>
2934
* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
3035
char*. fixed: [ruby-core:05470]
3136

37+
Wed Sep 7 08:32:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
38+
39+
* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
40+
sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
41+
description. [ruby-dev:26965]
42+
43+
* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
44+
mode (-v/-w); backported from 1.9. [ruby-dev:26963]
45+
3246
Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
3347

3448
* lib/ostruct.rb: a patch from Florian Gross <florgro@gmail.com>

ext/pty/pty.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ char *MasterDevice = "/dev/pty%s",
103103

104104
static char SlaveName[DEVICELEN];
105105

106-
extern int errno;
107-
108106
#ifndef HAVE_SETEUID
109107
# ifdef HAVE_SETREUID
110108
# define seteuid(e) setreuid(-1, (e))

ext/sdbm/_sdbm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static int duppair proto((char *, datum));
103103
/*
104104
* externals
105105
*/
106-
#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__
106+
#if !defined sun && !defined MSDOS && !defined _WIN32 && !defined __CYGWIN__ && !defined(errno)
107107
extern int errno;
108108
#endif
109109

missing/strchr.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ strrchr(s, c)
1919
char *s;
2020
int c;
2121
{
22-
char *save = 0;
22+
char *save;
2323

24+
if (c == 0) return s + strlen(s);
25+
save = 0;
2426
while (*s) {
2527
if (*s == c)
2628
save = s;

object.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,10 @@ rb_obj_ivar_set(obj, iv, val)
20542054
* class Fred
20552055
* @@foo = 99
20562056
* end
2057-
* Fred.class_variable_get(:@foo) #=> 99
2057+
*
2058+
* def Fred.foo
2059+
* class_variable_get(:@@foo) #=> 99
2060+
* end
20582061
*/
20592062

20602063
static VALUE
@@ -2083,7 +2086,11 @@ rb_mod_cvar_get(obj, iv)
20832086
* @@foo
20842087
* end
20852088
* end
2086-
* Fred.class_variable_set(:@foo, 101) #=> 101
2089+
*
2090+
* def Fred.foo
2091+
* class_variable_set(:@@foo, 101) #=> 101
2092+
* end
2093+
* Fred.foo
20872094
* Fred.new.foo #=> 101
20882095
*/
20892096

process.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,6 @@ static VALUE
20552055
p_uid_change_privilege(obj, id)
20562056
VALUE obj, id;
20572057
{
2058-
extern int errno;
20592058
int uid;
20602059

20612060
check_uid_switch();
@@ -2606,7 +2605,6 @@ static VALUE
26062605
p_gid_change_privilege(obj, id)
26072606
VALUE obj, id;
26082607
{
2609-
extern int errno;
26102608
int gid;
26112609

26122610
check_gid_switch();
@@ -3133,7 +3131,6 @@ static VALUE
31333131
p_uid_switch(obj)
31343132
VALUE obj;
31353133
{
3136-
extern int errno;
31373134
int uid, euid;
31383135

31393136
check_uid_switch();
@@ -3175,7 +3172,6 @@ static VALUE
31753172
p_uid_switch(obj)
31763173
VALUE obj;
31773174
{
3178-
extern int errno;
31793175
int uid, euid;
31803176

31813177
check_uid_switch();
@@ -3246,7 +3242,6 @@ static VALUE
32463242
p_gid_switch(obj)
32473243
VALUE obj;
32483244
{
3249-
extern int errno;
32503245
int gid, egid;
32513246

32523247
check_gid_switch();
@@ -3287,7 +3282,6 @@ static VALUE
32873282
p_gid_switch(obj)
32883283
VALUE obj;
32893284
{
3290-
extern int errno;
32913285
int gid, egid;
32923286

32933287
check_gid_switch();

0 commit comments

Comments
 (0)