summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-17 04:55:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-17 04:55:36 +0000
commit4b9cd6edce351b3ef506aabdcbc797a87f349750 (patch)
tree554a075b4ab0838acb276d6cce08994e60b7b8e1
parent55a692bbc2c24c854694df6902d23b3ee08bf665 (diff)
* ext/socket/lib/socket.rb: UNIXSocket is not always exists. fixes
install error on Windows, introduced at r52601. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/lib/socket.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa4aae13c0..f5d1b5a2e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 17 13:43:46 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/socket/lib/socket.rb: UNIXSocket is not always exists. fixes
+ install error on Windows, introduced at r52601.
+
Tue Nov 17 11:27:23 2015 Eric Wong <e@80x24.org>
* ext/socket/lib/socket.rb (Socket#recvfrom_nonblock):
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index eaec14f933..df526d73c6 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -1347,4 +1347,4 @@ class UNIXServer < UNIXSocket
def accept_nonblock(exception: true)
__accept_nonblock(exception)
end
-end
+end if defined?(UNIXSocket)