summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-19 07:29:59 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-04-19 07:29:59 +0000
commit98c527a8285edbb3ce7fdecf258e912a9f9f16e0 (patch)
treeaa1dab9b37fa56bd720f0e8a374f61223a6c55ff
parent7bd1bd0122ee3c538b28da759008b6fa553de06a (diff)
downloadruby-98c527a8285edbb3ce7fdecf258e912a9f9f16e0.tar.gz
ruby-98c527a8285edbb3ce7fdecf258e912a9f9f16e0.tar.xz
ruby-98c527a8285edbb3ce7fdecf258e912a9f9f16e0.zip
* ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/extconf.rb28
2 files changed, 23 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f3e565f3a..dc363a1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 19 16:22:55 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
+
Fri Apr 19 14:57:44 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* re.c (rb_reg_to_s): remove redundant shy group.
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 46557682a..c28840894 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -157,11 +157,16 @@ EOS
end
if try_link(<<EOF)
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#endif
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
int
main()
{
@@ -175,10 +180,15 @@ EOF
end
if try_link(<<EOF)
-#include <sys/types.h>
-#include <netdb.h>
-#include <string.h>
-#include <sys/socket.h>
+#ifdef _WIN32
+# include <windows.h>
+# include <winsock.h>
+#else
+# include <sys/types.h>
+# include <netdb.h>
+# include <string.h>
+# include <sys/socket.h>
+#endif
int
main()
{