summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-08 15:49:35 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-08 15:49:35 +0000
commit852202b3e5d3f53cca72a6310d37f8110fd05b04 (patch)
treeb6f195a6082cb973c69ae03d99850fee7f0eeabb
parent100c3d7f8857e94ea15d1efc11843b87938910b1 (diff)
downloadruby-852202b3e5d3f53cca72a6310d37f8110fd05b04.tar.gz
ruby-852202b3e5d3f53cca72a6310d37f8110fd05b04.tar.xz
ruby-852202b3e5d3f53cca72a6310d37f8110fd05b04.zip
LOCAL_PEERCRED is also available on MacOS X.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/socket/option.c2
-rw-r--r--test/socket/test_unix.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c
index ff60cfb53..980acda85 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -256,7 +256,7 @@ inspect_peercred(int level, int optname, VALUE data, VALUE ret)
}
#endif
-#if defined(LOCAL_PEERCRED) /* FreeBSD */
+#if defined(LOCAL_PEERCRED) /* FreeBSD, MacOS X */
static int
inspect_local_peercred(int level, int optname, VALUE data, VALUE ret)
{
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index 6b5459473..fb0c47d34 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -313,7 +313,7 @@ class TestUNIXSocket < Test::Unit::TestCase
end
def test_getcred_xucred
- return if /freebsd/ !~ RUBY_PLATFORM
+ return if /freebsd|darwin/ !~ RUBY_PLATFORM
Dir.mktmpdir {|d|
sockpath = "#{d}/sock"
serv = Socket.unix_server_socket(sockpath)