diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-02 12:14:35 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-02 12:14:35 +0000 |
| commit | fb5d4ecfb5d03aa9f6116b53dbcb1b72bbba3c95 (patch) | |
| tree | f9c1f0b3c19dec3bb75b78d63b595fbf839d3118 | |
| parent | a36ea435d26b97d2ca185e315106c856e5d2c9de (diff) | |
* ext/socket/ancdata.c (rsock_discard_cmsg_resource): defined
unconditionally.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 4 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 1 | ||||
| -rw-r--r-- | test/socket/test_unix.rb | 1 |
4 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Mar 2 21:13:42 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/ancdata.c (rsock_discard_cmsg_resource): defined + unconditionally. + Mon Mar 2 21:06:40 2009 Tanaka Akira <akr@fsij.org> * ext/socket/raddrinfo.c (addrinfo_mload): don't use "sun" variable diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index edc93630ca..56aa5ed1f0 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1387,10 +1387,12 @@ discard_cmsg(struct cmsghdr *cmh, char *msg_end) } } } +#endif void rsock_discard_cmsg_resource(struct msghdr *mh) { +#if defined(HAVE_ST_MSG_CONTROL) struct cmsghdr *cmh; char *msg_end; @@ -1402,8 +1404,8 @@ rsock_discard_cmsg_resource(struct msghdr *mh) for (cmh = CMSG_FIRSTHDR(mh); cmh != NULL; cmh = CMSG_NXTHDR(mh, cmh)) { discard_cmsg(cmh, msg_end); } -} #endif +} #if defined(HAVE_ST_MSG_CONTROL) static void diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index d6a70dd40f..fe6ea1f5fc 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -312,6 +312,7 @@ class TestSocket < Test::Unit::TestCase def test_timestamp return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM + return if !defined?(Socket::AncillaryData) t1 = Time.now.strftime("%Y-%m-%d") stamp = nil Addrinfo.udp("127.0.0.1", 0).bind {|s1| diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index e75d7b6f9a..fdf0ce72ea 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -69,6 +69,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase def test_fd_passing_n2 io_ary = [] return if !defined?(Socket::SCM_RIGHTS) + return if !defined?(Socket::AncillaryData) io_ary.concat IO.pipe io_ary.concat IO.pipe io_ary.concat IO.pipe |