From: Katsuyuki Komatsu <komatsu@...>
Date: 2000-06-01T11:41:33+09:00
Subject: [ruby-dev:9941] Re: Forward: Error in NT makefile (PR#7)

小松です。

In the message of [ruby-dev:9938] Re: Forward: Error in NT makefile (PR#7)
    on 2000/6/1 WATANABE Hirofumi <Hirofumi.Watanabe@jp.sony.com> wrote:
|あ, いや問題ありです.
|Win32 API 関数以外はすべて error になってしまいます.
|だから 2 回 try してたのか.
|
|extern foo(); するわけにもいかないし, 難しいなあ.

とりあえず、なかったことにしますか？

diff -ru1p ruby-1.5.4.dist/ChangeLog ruby-1.5.4/ChangeLog
--- ruby-1.5.4.dist/ChangeLog	Wed May 31 12:09:59 2000
+++ ruby-1.5.4/ChangeLog	Thu Jun  1 11:38:11 2000
@@ -15,7 +15,2 @@ Tue May 30 23:33:41 2000  Katsuyuki Koma
 
-	* ext/extmk.rb.in (have_library, have_func): remove unnecessary
-	  try_link() call from the mswin32 platform branch.
-
-	* lib/mkmf.rb (have_library, have_func): ditto.
-
 	* lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
diff -ru1p ruby-1.5.4.dist/ext/extmk.rb.in ruby-1.5.4/ext/extmk.rb.in
--- ruby-1.5.4.dist/ext/extmk.rb.in	Wed May 31 12:10:05 2000
+++ ruby-1.5.4/ext/extmk.rb.in	Thu Jun  1 11:38:11 2000
@@ -176,4 +176,12 @@ def have_library(lib, func="main")
 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
@@ -220,4 +228,12 @@ def have_func(func)
 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
diff -ru1p ruby-1.5.4.dist/lib/mkmf.rb ruby-1.5.4/lib/mkmf.rb
--- ruby-1.5.4.dist/lib/mkmf.rb	Wed May 31 12:10:06 2000
+++ ruby-1.5.4/lib/mkmf.rb	Thu Jun  1 11:38:11 2000
@@ -161,4 +161,12 @@ def have_library(lib, func="main")
 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
@@ -215,4 +223,12 @@ def have_func(func)
 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

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