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 + + * 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 * 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 */