ruby-dev

小松です。

In the message of [ruby-dev:7436] Re: [PATCH] mswin32 support
    on 1999/7/27 13:40:26 matz@netlab.co.jp (Yukihiro Matsumoto) wrote:
||だいたいよさそうなので、出してしまいます。
||patchは1999/7/22のcheckinに対するdiffです。
|
|パッチ当てました。1.3.6出そう。

やっぱりやりすぎててruby-gtk-0.20のMakefile作成に失敗してしまいました。
[ruby-dev:7430]のパッチに対するパッチです。

# 間に合うか。

--- ext/extmk.rb.nt-ruby-dev-7430	Tue Jul 27 10:33:14 1999
+++ ext/extmk.rb.nt	Tue Jul 27 21:55:06 1999
@@ -173,12 +173,21 @@ def have_library(lib, func="main")
   if func && func != ""
     libs = append_library($libs, lib)
     #print "libs=#{libs}\n"
-    unless try_link(<<"SRC", libs)
+    r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    unless r
+      r = try_link(<<"SRC", libs)
 #include <windows.h>
 #include <winsock.h>
 int main() { return 0; }
 int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+    end
+    unless r
       #print "fail : #{libs}\n"
       $lib_cache[lib] = 'no'
       $cache_mod = true
@@ -205,12 +214,21 @@ def have_func(func)
   libs = $libs
 
   #print "libs=#{libs}\n"
-  unless try_link(<<"SRC", libs)
+  r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+  unless r
+    try_link(<<"SRC", libs)
 #include <windows.h>
 #include <winsock.h>
 int main() { return 0; }
 int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+  end
+  unless r
     $func_cache[func] = 'no'
     $cache_mod = true
     return false
--- lib/mkmf.rb-ruby-dev-7430	Tue Jul 27 10:33:05 1999
+++ lib/mkmf.rb	Tue Jul 27 21:39:10 1999
@@ -178,8 +178,16 @@ def have_library(lib, func="main")
 #include <windows.h>
 #include <winsock.h>
 int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+      unless r
+        r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
 int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+      end
     else
       r = try_link(<<"SRC", libs)
 int main() { return 0; }
@@ -224,8 +232,16 @@ def have_func(func)
 #include <windows.h>
 #include <winsock.h>
 int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+    unless r
+      r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
 int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
 SRC
+    end
   else
     r = try_link(<<"SRC", libs)
 int main() { return 0; }

--
小松克行 / Katsuyuki Komatsu <komatsu@sarion.co.jp>

Thread

Prev Next

In This Thread

Prev Next

[#7273] [BUG] regex.c — gotoken@... (GOTO Kentaro)

[#7275] RE: ruby-gtk 0.19 patch for mswin32 — 助田 雅紀 <masaki.suketa@...>

[#7279] Re: ruby-gtk 0.19 patch for mswin32 — 助田 雅紀 <masaki.suketa@...>

[#7284] font-lock in ruby-mode.el — Shugo Maeda <shugo@...>

[#7286] Re: Subscribe confirmation request (ruby developers list) — S-Harada<jdn@...>

[#7291] dualstack-httpd.rb — gotoken@... (GOTO Kentaro)

[#7293] [BUG] Integer#/ — Shugo Maeda <shugo@...>

[#7299] Re: Subscribe confirmation request (ruby developers list) — Satoshi Nojo <nojo@...>

[#7300] resolver を呼ばない UDPsocket#recvfrom — Toshihiko SHIMOKAWA / 下川俊彦 <toshi@...>

[#7301] Re: mod_ruby/0.1.2 with Apache/1.3.6 on Solaris/2.5.1 — matz@... (Yukihiro Matsumoto)

[#7313] Ruby 1.3.5 — Yukihiro Matsumoto <matz@...>

[#7319] Sequence — gotoken@... (GOTO Kentaro)

[#7327] [PATCH] ext/extmk.rb.in, instruby.rb, lib/mkmf.rb — Katsuyuki Komatsu <komatsu@...>

[#7328] [PATCH] unused variable cleanup — Katsuyuki Komatsu <komatsu@...>

[#7334] Re: [ruby-list:15459] Re: chomp で nil が返るのは？ — Koji Arai <JCA02266@...>

[#7339] $libs in ext/extmk.rb.in, lib/mkmf.rb — WATANABE Hirofumi <watanabe@...>

[#7347] AC_OBJEXT — Katsuyuki Komatsu <komatsu@...>

[#7353] const assign — Minero Aoki <aamine@...>

[#7365] [PATCH]suppress warning, ext/tcltklib/tcltklib.c — Ryo HAYASAKA <hayasaka@...21.u-aizu.ac.jp>

[#7387] [PATCH]extconf.rb, tcltklib.c, and rubytest.rb for NetBSD — Ryo HAYASAKA <hayasaka@...21.u-aizu.ac.jp>

[#7414] /(?!.)/ — Wakou Aoyama <wakou@...>

[#7417] [BUG] Dir.glob — Koji Arai <JCA02266@...>

[#7418] jcode.rb — WATANABE Hirofumi <watanabe@...>

[#7419] File#expand_path ignore drive letter on mswin32 — Katsuyuki Komatsu <komatsu@...>

[#7424] system "command > nul" — Katsuyuki Komatsu <komatsu@...>

[#7425] make test on mswin32 — Katsuyuki Komatsu <komatsu@...>

[#7428] [PATCH] tools.rb — WATANABE Hirofumi <watanabe@...>

[#7430] [PATCH] mswin32 support — Katsuyuki Komatsu <komatsu@...>

[#7438] Re: [ruby-list:15672] Re: debugger exception handle (Re: Modified debug.rb) — keiju@... (石塚圭樹)

[#7444] dualstack-*.rb on mswin32 — Katsuyuki Komatsu <komatsu@...>

[#7453] [PATCH] reduce recursive calls to rb_eval() — EGUCHI Osamu <eguchi@...>

[#7458] compile on AIX — matz@... (Yukihiro Matsumoto)

[#7466] [PATCH] for djgpp — WATANABE Hirofumi <watanabe@...>

[#7471] Range#each — WATANABE Hirofumi <watanabe@...>

[#7476] regexp — KIMURA Koichi <kimura@...>

[#7478] constant in class_eval{} — Inaba Hiroto <inaba@...>

[#7480] ENV[] on mswin32 — Katsuyuki Komatsu <komatsu@...>

[#7489] Re: ENV[] on mswin32 — 助田 雅紀 <masaki.suketa@...>

[#7492] Re: ENV[] on mswin32 — 助田 雅紀 <masaki.suketa@...>

[#7495] Re: constant in class_eval{} — Inaba Hiroto <inaba@...>

[#7496] Re: [ruby-list:15743] ruby debugger (like gdb attach) — "NAKAMURA, Hiroshi" <nakahiro@...>

[#7500] mswin32 update — Katsuyuki Komatsu <komatsu@...>

[#7501] [PATCH] mswin32 tcltklib for Tcl/Tk 8.0jp — Katsuyuki Komatsu <komatsu@...>

[#7503] [PATCH] find_library() — Katsuyuki Komatsu <komatsu@...>

[#7508] [BUG?] install failed — Yasuhiro Fukuma <yasuf@...>

[#7510] [patch] for OS/2 — kenn@...

[#7514] RTLD_NOW or RTLD_LAZY (Re: [ruby-list:15779]) — ttate@...

[#7515] Re: ERb について — matz@... (Yukihiro Matsumoto)

[ruby-dev:7452] Re: [PATCH] mswin32 support

Thread

In This Thread

[#7275] RE: ruby-gtk 0.19 patch for mswin32 — 助田　雅紀 <masaki.suketa@...>

[#7279] Re: ruby-gtk 0.19 patch for mswin32 — 助田　雅紀 <masaki.suketa@...>

[#7489] Re: ENV[] on mswin32 — 助田　雅紀 <masaki.suketa@...>

[#7492] Re: ENV[] on mswin32 — 助田　雅紀 <masaki.suketa@...>