зеркало из https://github.com/github/ruby.git
use rb_pid_t instead of pid_t.
* process.c (rb_execarg_addopt, run_exec_pgroup): use rb_pid_t instead of pid_t. * ext/pty/pty.c (raise_from_check, pty_check): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
f7108c5d1a
Коммит
7e052c7b81
|
@ -1,3 +1,10 @@
|
||||||
|
Fri Mar 22 01:00:17 2013 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
|
||||||
|
|
||||||
|
* process.c (rb_execarg_addopt, run_exec_pgroup): use rb_pid_t
|
||||||
|
instead of pid_t.
|
||||||
|
|
||||||
|
* ext/pty/pty.c (raise_from_check, pty_check): ditto.
|
||||||
|
|
||||||
Fri Mar 22 00:04:15 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
Fri Mar 22 00:04:15 2013 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
|
* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
|
||||||
|
|
|
@ -604,9 +604,9 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
NORETURN(static void raise_from_check(pid_t pid, int status));
|
NORETURN(static void raise_from_check(rb_pid_t pid, int status));
|
||||||
static void
|
static void
|
||||||
raise_from_check(pid_t pid, int status)
|
raise_from_check(rb_pid_t pid, int status)
|
||||||
{
|
{
|
||||||
const char *state;
|
const char *state;
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
@ -654,7 +654,7 @@ static VALUE
|
||||||
pty_check(int argc, VALUE *argv, VALUE self)
|
pty_check(int argc, VALUE *argv, VALUE self)
|
||||||
{
|
{
|
||||||
VALUE pid, exc;
|
VALUE pid, exc;
|
||||||
pid_t cpid;
|
rb_pid_t cpid;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
rb_scan_args(argc, argv, "11", &pid, &exc);
|
rb_scan_args(argc, argv, "11", &pid, &exc);
|
||||||
|
|
|
@ -1619,7 +1619,7 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
|
||||||
id = SYM2ID(key);
|
id = SYM2ID(key);
|
||||||
#ifdef HAVE_SETPGID
|
#ifdef HAVE_SETPGID
|
||||||
if (id == rb_intern("pgroup")) {
|
if (id == rb_intern("pgroup")) {
|
||||||
pid_t pgroup;
|
rb_pid_t pgroup;
|
||||||
if (eargp->pgroup_given) {
|
if (eargp->pgroup_given) {
|
||||||
rb_raise(rb_eArgError, "pgroup option specified twice");
|
rb_raise(rb_eArgError, "pgroup option specified twice");
|
||||||
}
|
}
|
||||||
|
@ -2783,7 +2783,7 @@ run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *
|
||||||
* (Is there an environment which has setpgid but no FD_CLOEXEC?)
|
* (Is there an environment which has setpgid but no FD_CLOEXEC?)
|
||||||
*/
|
*/
|
||||||
int ret;
|
int ret;
|
||||||
pid_t pgroup;
|
rb_pid_t pgroup;
|
||||||
|
|
||||||
pgroup = eargp->pgroup_pgid;
|
pgroup = eargp->pgroup_pgid;
|
||||||
if (pgroup == -1)
|
if (pgroup == -1)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче