aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-19 03:17:34 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-19 03:17:34 +0000
commitb945ad289f14c1b1ba65bdd9a4e1106f3cee134c (patch)
treed7a8440fa5062436621f1e215c964e6f66169458
parent3ee89c6277975db0a09f903b96da8f7fecfef8a6 (diff)
downloadruby-b945ad289f14c1b1ba65bdd9a4e1106f3cee134c.tar.gz
* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
Because musl libc doesn't have it. [Bug #8051] [ruby-core:53229] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 48c7aea6fa..e1cce6861f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 16 00:42:39 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
+ Because musl libc doesn't have it. [Bug #8051] [ruby-core:53229]
+
Tue Mar 19 10:05:04 2013 Shota Fukumori <her@sorah.jp>
* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
diff --git a/io.c b/io.c
index eb8b80c63b..cc91f7b51c 100644
--- a/io.c
+++ b/io.c
@@ -8473,7 +8473,7 @@ do_ioctl(int fd, ioctl_req_t cmd, long narg)
#define DEFULT_IOCTL_NARG_LEN (256)
-#ifdef __linux__
+#if defined(__linux__) && defined(_IOC_SIZE)
static long
linux_iocparm_len(ioctl_req_t cmd)
{
@@ -8506,7 +8506,7 @@ ioctl_narg_len(ioctl_req_t cmd)
#endif
#ifdef IOCPARM_LEN
len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */
-#elif defined(__linux__)
+#elif defined(__linux__) && defined(_IOC_SIZE)
len = linux_iocparm_len(cmd);
#else
/* otherwise guess at what's safe */