ruby-dev

こんにちは。

pkgsrc方面で、DragonFly BSDに対応させるためのパッチというのをいただい
たのですが、その大半は、

extern int errno;

という宣言を削除するものでした。伝統的なUNIXでは、errnoはグローバルに
宣言されたintの変数であるとされていました。しかし、おそらくスレッド関
係の導入によって、「値の変更が可能なintの左辺値に展開されるマクロ」と
され、<errno.h>といったヘッダ・ファイルが用意されるようになっています。

Ruby 1.8.3のpreviewでは一部削除された部分もあるようですが、まだerrnoを
不用意に宣言している部分があります。

後に、RubyのHEADとruby_1_8ブランチに対するパッチを同封します。

-- 
Takahiro Kambe <taca@back-street.net>

P.S.
以下のようなパッチもいただいたのですが、この変更が正しいかどうか私には
わかりませんでした。

+
+--- ext/dl/dl.c.orig	2005-08-17 17:14:22.000000000 +0000
++++ ext/dl/dl.c
+@@ -543,7 +543,11 @@ rb_io_to_ptr(VALUE self)
+   GetOpenFile(self, fptr);
+   fp = fptr->f;
+
++#if defined(__DragonFly__)
++  return fp ? rb_dlptr_new(fp, 1, 0) : Qnil;
++#else
+   return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil;
++#endif
+ }
+
+ VALUE

Attachments (2)

patch-to-HEAD (2.22 KB, text/x-diff)

Index: process.c
===================================================================
RCS file: /src/ruby/process.c,v
retrieving revision 1.135
diff -u -u -p -r1.135 process.c
--- process.c	31 Aug 2005 01:40:20 -0000	1.135
+++ process.c	8 Sep 2005 02:50:19 -0000
@@ -2281,7 +2281,6 @@ static VALUE
 p_uid_change_privilege(obj, id)
     VALUE obj, id;
 {
-    extern int errno;
     int uid;
 
     check_uid_switch();
@@ -2886,7 +2885,6 @@ static VALUE
 p_gid_change_privilege(obj, id)
     VALUE obj, id;
 {
-    extern int errno;
     int gid;
 
     check_gid_switch();
@@ -3413,7 +3411,6 @@ static VALUE
 p_uid_switch(obj)
     VALUE obj;
 {
-    extern int errno;
     int uid, euid;
 
     check_uid_switch();
@@ -3455,7 +3452,6 @@ static VALUE
 p_uid_switch(obj)
     VALUE obj;
 {
-    extern int errno;
     int uid, euid;
 
     check_uid_switch();
@@ -3526,7 +3522,6 @@ static VALUE
 p_gid_switch(obj)
     VALUE obj;
 {
-    extern int errno;
     int gid, egid;
 
     check_gid_switch();
@@ -3567,7 +3562,6 @@ static VALUE
 p_gid_switch(obj)
     VALUE obj;
 {
-    extern int errno;
     int gid, egid;
 
     check_gid_switch();
Index: ext/pty/pty.c
===================================================================
RCS file: /src/ruby/ext/pty/pty.c,v
retrieving revision 1.23
diff -u -u -p -r1.23 pty.c
--- ext/pty/pty.c	14 May 2005 14:57:03 -0000	1.23
+++ ext/pty/pty.c	8 Sep 2005 02:50:19 -0000
@@ -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))
Index: ext/sdbm/_sdbm.c
===================================================================
RCS file: /src/ruby/ext/sdbm/_sdbm.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 _sdbm.c
--- ext/sdbm/_sdbm.c	28 May 2001 16:07:34 -0000	1.5
+++ ext/sdbm/_sdbm.c	8 Sep 2005 02:50:19 -0000
@@ -103,7 +103,7 @@ static int   duppair proto((char *, datu
 /*
  * 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

patch-to-ruby_1_8 (2.24 KB, text/x-diff)

Index: process.c
===================================================================
RCS file: /src/ruby/process.c,v
retrieving revision 1.92.2.23
diff -u -u -p -r1.92.2.23 process.c
--- process.c	31 Aug 2005 01:40:56 -0000	1.92.2.23
+++ process.c	8 Sep 2005 02:47:10 -0000
@@ -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();
Index: ext/pty/pty.c
===================================================================
RCS file: /src/ruby/ext/pty/pty.c,v
retrieving revision 1.19.2.2
diff -u -u -p -r1.19.2.2 pty.c
--- ext/pty/pty.c	14 May 2005 14:57:51 -0000	1.19.2.2
+++ ext/pty/pty.c	8 Sep 2005 02:47:10 -0000
@@ -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))
Index: ext/sdbm/_sdbm.c
===================================================================
RCS file: /src/ruby/ext/sdbm/_sdbm.c,v
retrieving revision 1.5
diff -u -u -p -r1.5 _sdbm.c
--- ext/sdbm/_sdbm.c	28 May 2001 16:07:34 -0000	1.5
+++ ext/sdbm/_sdbm.c	8 Sep 2005 02:47:10 -0000
@@ -103,7 +103,7 @@ static int   duppair proto((char *, datu
 /*
  * 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

Thread

Prev Next

In This Thread

Prev Next

[#26934] safe level preserved in method — nobuyoshi nakada <nobuyoshi.nakada@...>

[#26935] __send__ in lib — nobuyoshi nakada <nobuyoshi.nakada@...>

[#26942] core dump with ripper — Tanaka Akira <akr@...17n.org>

[#26944] string.c中の文字検索 — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#26952] ripper problems. — Tanaka Akira <akr@...17n.org>

[#26954] Re: core dump with ripper — Yukihiro Matsumoto <matz@...>

[#26962] Re: about Ruby-GetText — Yukihiro Matsumoto <matz@...>

[#26963] sprintf does not warn in verbose mode. — sheepman <sheepman@...>

[#26964] ripper warnings — Tanaka Akira <akr@...17n.org>

[#26965] patch for RDoc about Module#class_variable_get — sheepman <sheepman@...>

[#26967] Tempfile.new("z").extend(M) — Tanaka Akira <akr@...17n.org>

[#26975] [proposal] ANSI style function — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#26984] elimination of "extern int errno;" — Takahiro Kambe <taca@...>

[#27044] test errors and failures — nobuyoshi nakada <nobuyoshi.nakada@...>

[#27051] fail on test/rss — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27062] test/net/http/test_https_proxy.rb doesn't finish — Tanaka Akira <akr@...17n.org>

[#27077] select pipe support on native Win32 — "U.Nakamura" <usa@...>

[#27097] ruby-cvsのSubject — Kazuhiro NISHIYAMA <zn@...>

[#27102] Re: Welcome to our (ruby developers list) You are added automatically — MIYAMUKO Katsuyuki <miyamuko@...>

[#27105] Dir.glob delimiter — nobuyoshi nakada <nobuyoshi.nakada@...>

[#27111] compile error on hp-ux — MIYAMUKO Katsuyuki <miyamuko@...>

[#27122] flock and ^C — Tanaka Akira <akr@...17n.org>

[#27123] test/socket/test_tcp.rb blocks on NetBSD — Tanaka Akira <akr@...17n.org>

[#27127] can't convert Pathname into String — Tanaka Akira <akr@...17n.org>

[#27129] 1/2 under mathn — Tanaka Akira <akr@...17n.org>

[#27132] BasicSocket#send and ^C — Tanaka Akira <akr@...17n.org>

[#27133] core dump with win32ole — Masaki Suketa <masaki.suketa@...>

[#27134] syswrite and ^C — Tanaka Akira <akr@...17n.org>

[#27136] prohibit calling tainted method — sheepman <sheepman@...>

[#27139] ruby-1.8.3 status for release — Masayoshi Takahashi <maki@...>

[#27140] [PATCH] File#chown(nil, nil) — Minero Aoki <aamine@...>

[#27141] Interix3 (SFU)サポート — Takahiro Kambe <taca@...>

[#27145] test_fileutils fail — sheepman <sheepman@...>

[#27150] test_readline.rb blocks on NetBSD. — Tanaka Akira <akr@...17n.org>

[#27152] File.expand_path(Pathname.new("a")) — Tanaka Akira <akr@...17n.org>

[#27156] close error smashes an exception in a block — Tanaka Akira <akr@...17n.org>

[#27185] PIPE_BUF is not defined — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27202] test_dbm and test_gdbm on FC4 — "NAKAMURA, Hiroshi" <nakahiro@...>

[#27226] world writable dir with sticky bit — sheepman <sheepman@...>

[#27233] yaml warnig in verbose mode — sheepman <sheepman@...>

[#27242] Ruby 1.8.3 released — Yukihiro Matsumoto <matz@...>

[#27248] glob from command line still broken in djgpp? — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27251] 脆弱性レポート翻訳者募集 — Yukihiro Matsumoto <matz@...>

[#27262] [rails:373] Ruby-1.8.3正式版に変えたらエラー — take_tk <ggb03124@...>

[#27270] ext/tk/sample/demos-en/tcolor.bak — Kazuhiro NISHIYAMA <zn@...>

[#27275] release schedule plan for 1.8.4 — "NARUSE, Yui" <naruse@...>

[#27281] env -i make; fails. — "URABE Shyouhei aka.mput" <root@...>

[#27297] warning of yaml/basenode.rb — 雪見酒 <yukimi_sake@...>

[#27302] warning: 'cdecl' attribute directive ignored — Kazuhiro NISHIYAMA <zn@...>

[#27310] RSSが見えない — Kazuhiro NISHIYAMA <zn@...>

[#27312] many net/http related test failures (Re: [ruby-cvs:15621] ruby, ruby/test/net/http: * test/net/http/test_http.rb: new file.) — Tanaka Akira <akr@...17n.org>

[#27314] test/ripper error (directory cannot be opened on windows) — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27316] OptionParser doesn't raise when given h — sheepman <sheepman@...>

[#27317] sizeof(FILE) — Tanaka Akira <akr@...17n.org>

[#27318] Re: [ruby-cvs:15644] ruby, ruby/lib: * lib/optparse.rb (RequiredArgument#parse): not consume unmatched — "U.Nakamura" <usa@...>

[#27321] RubyGemsとOS platformとの関係 — Daigo Moriwaki <techml@...>

[#27324] ext/digest on DrafonFly — Takahiro Kambe <taca@...>

[#27331] possible SEGV in rb_autoload_load? — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27334] File#read にゴミがつく — Yusuke ENDOH <mame@...>

[#27335] tcl 8.0 の環境で tcltklib がコンパイルできない — ENDOH Yusuke <mame@...>

[ruby-dev:26984] elimination of "extern int errno;"

Attachments (2)

Thread

In This Thread

[#26935] send in lib — nobuyoshi nakada <nobuyoshi.nakada@...>