summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 07:16:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 07:16:30 +0000
commitd4840cc785e29bddb9f0567c8d63a323b6dfdd84 (patch)
tree1dbbc0d48c5907f99c7b24d7fd3f2c971c2adcab
parentd4bd69441170a6a07470973640f329673fe1785e (diff)
* ext/socket/rubysocket.h: non-implemented method definitions need
to be shared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/ancdata.c8
-rw-r--r--ext/socket/rubysocket.h6
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 0986436..1690520 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 28 16:16:26 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/rubysocket.h: non-implemented method definitions need
+ to be shared.
+
Wed Apr 28 10:27:33 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vsnprintf.c (ruby_vsnprintf, ruby_snprintf): suppress warnings.
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index a42aea7..95a47b0 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1330,8 +1330,6 @@ rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock)
{
return bsock_sendmsg_internal(argc, argv, sock, 0);
}
-#else
-#define rsock_bsock_sendmsg rb_f_notimplement
#endif
#if defined(HAVE_SENDMSG)
@@ -1351,8 +1349,6 @@ rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock)
{
return bsock_sendmsg_internal(argc, argv, sock, 1);
}
-#else
-#define bsock_sendmsg_nonblock rb_f_notimplement
#endif
#if defined(HAVE_RECVMSG)
@@ -1742,8 +1738,6 @@ rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock)
{
return bsock_recvmsg_internal(argc, argv, sock, 0);
}
-#else
-#define rsock_bsock_recvmsg rb_f_notimplement
#endif
#if defined(HAVE_RECVMSG)
@@ -1763,8 +1757,6 @@ rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
{
return bsock_recvmsg_internal(argc, argv, sock, 1);
}
-#else
-#define rsock_bsock_recvmsg_nonblock rb_f_notimplement
#endif
/*
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 1ef26e6..356e6f3 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -263,10 +263,16 @@ VALUE rsock_sockopt_new(int family, int level, int optname, VALUE data);
#if defined(HAVE_SENDMSG)
VALUE rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock);
VALUE rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+#else
+#define rsock_bsock_sendmsg rb_f_notimplement
+#define rsock_bsock_sendmsg_nonblock rb_f_notimplement
#endif
#if defined(HAVE_RECVMSG)
VALUE rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock);
VALUE rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock);
+#else
+#define rsock_bsock_recvmsg rb_f_notimplement
+#define rsock_bsock_recvmsg_nonblock rb_f_notimplement
#endif
#ifdef HAVE_ST_MSG_CONTROL