summaryrefslogtreecommitdiffstats
path: root/ext/socket
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-24 05:18:47 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-07-24 05:18:47 +0000
commit242d1879f3105377fe1153a21043bebbbaa7b208 (patch)
tree425980c3ebfb78d38067b3b01f2df97a9dc0853d /ext/socket
parent3e278b0745c94b5bba04c680778b21b6a0d785d9 (diff)
downloadruby-242d1879f3105377fe1153a21043bebbbaa7b208.tar.gz
ruby-242d1879f3105377fe1153a21043bebbbaa7b208.tar.xz
ruby-242d1879f3105377fe1153a21043bebbbaa7b208.zip
* eval.c (thgroup_add): no warning for terminated threads.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r--ext/socket/extconf.rb25
1 files changed, 23 insertions, 2 deletions
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index b9e66f676..c5489a953 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,7 +1,5 @@
require 'mkmf'
-$CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
-
case RUBY_PLATFORM
when /bccwin32/
test_func = "WSACleanup"
@@ -150,6 +148,29 @@ main()
}
EOF
$CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
+else # doug's fix, NOW add -Dss_family... only if required!
+$CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
+ if try_link(<<EOF)
+#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()
+{
+ struct sockaddr_storage ss;
+
+ ss.ss_family;
+ return 0;
+}
+EOF
+ $CFLAGS="-DHAVE_SOCKADDR_STORAGE "+$CFLAGS
+end
end
if try_link(<<EOF)