kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().

Browse source 
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
This commit is contained in:
kosaki 2013-03-19 03:17:34 +00:00
parent 3ee89c6277
commit b945ad289f
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Mar 19 10:05:04 2013 Shota Fukumori <her@sorah.jp>
* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto. * ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.

4
io.c
View file

@ -8473,7 +8473,7 @@ do_ioctl(int fd, ioctl_req_t cmd, long narg)
#define DEFULT_IOCTL_NARG_LEN (256) #define DEFULT_IOCTL_NARG_LEN (256)
#ifdef __linux__ #if defined(__linux__) && defined(_IOC_SIZE)
static long static long
linux_iocparm_len(ioctl_req_t cmd) linux_iocparm_len(ioctl_req_t cmd)
{ {
@ -8506,7 +8506,7 @@ ioctl_narg_len(ioctl_req_t cmd)
#endif #endif
#ifdef IOCPARM_LEN #ifdef IOCPARM_LEN
len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */ len = IOCPARM_LEN(cmd); /* on BSDish systems we're safe */
#elif defined(__linux__) #elif defined(__linux__) && defined(_IOC_SIZE)
len = linux_iocparm_len(cmd); len = linux_iocparm_len(cmd);
#else #else
/* otherwise guess at what's safe */ /* otherwise guess at what's safe */