ruby-changes:57181
From: Yusuke <ko1@a...>
Date: Tue, 20 Aug 2019 00:21:18 +0900 (JST)
Subject: [ruby-changes:57181] Yusuke Endoh: 8df25214de (master): io.c: make ioctl_req_t int in Android
https://git.ruby-lang.org/ruby.git/commit/?id=8df25214de From 8df25214de1a240ec6859415692b29955d2d423a Mon Sep 17 00:00:00 2001 From: Yusuke Endoh <mame@r...> Date: Tue, 20 Aug 2019 00:17:26 +0900 Subject: io.c: make ioctl_req_t int in Android The second argument of ioctl seems to be int in Android. Android is not a supported platform, but this one-line change allows ruby to build by Android NDK r20. diff --git a/io.c b/io.c index 19ce45c..e918f1c 100644 --- a/io.c +++ b/io.c @@ -9560,7 +9560,7 @@ rb_f_select(int argc, VALUE *argv, VALUE obj) https://github.com/ruby/ruby/blob/trunk/io.c#L9560 return rb_ensure(select_call, (VALUE)&args, select_end, (VALUE)&args); } -#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) typedef unsigned long ioctl_req_t; # define NUM2IOCTLREQ(num) NUM2ULONG(num) #else -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/