From 5e7101d3487846d83f8038856728ec77f931ecb6 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Apr 2010 07:28:53 +0000 Subject: [PATCH] * ext/socket/unixsocket.c (sendmsg_blocking, recvmsg_blocking): define only when used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- ext/socket/unixsocket.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1690520523..91f44de8ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Wed Apr 28 16:16:26 2010 Nobuyoshi Nakada +Wed Apr 28 16:28:51 2010 Nobuyoshi Nakada + + * ext/socket/unixsocket.c (sendmsg_blocking, recvmsg_blocking): + define only when used. * ext/socket/rubysocket.h: non-implemented method definitions need to be shared. diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index e0b081ad06..1e3fb0784f 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -169,6 +169,7 @@ struct iomsg_arg { struct msghdr msg; }; +#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS) static VALUE sendmsg_blocking(void *data) { @@ -176,7 +177,6 @@ sendmsg_blocking(void *data) return sendmsg(arg->fd, &arg->msg, 0); } -#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS) /* * call-seq: * unixsocket.send_io(io) => nil @@ -258,6 +258,7 @@ unix_send_io(VALUE sock, VALUE val) #define unix_send_io rb_f_notimplement #endif +#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS) static VALUE recvmsg_blocking(void *data) { @@ -265,7 +266,6 @@ recvmsg_blocking(void *data) return recvmsg(arg->fd, &arg->msg, 0); } -#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS) /* * call-seq: * unixsocket.recv_io([klass [, mode]]) => io