summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ext/pty/pty.c6
-rw-r--r--process.c4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ec474b..81dc91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 8ac7314..5986a8d 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -604,9 +604,9 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
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
-raise_from_check(pid_t pid, int status)
+raise_from_check(rb_pid_t pid, int status)
{
const char *state;
char buf[1024];
@@ -654,7 +654,7 @@ static VALUE
pty_check(int argc, VALUE *argv, VALUE self)
{
VALUE pid, exc;
- pid_t cpid;
+ rb_pid_t cpid;
int status;
rb_scan_args(argc, argv, "11", &pid, &exc);
diff --git a/process.c b/process.c
index f5ccbbe..bb98070 100644
--- a/process.c
+++ b/process.c
@@ -1619,7 +1619,7 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
id = SYM2ID(key);
#ifdef HAVE_SETPGID
if (id == rb_intern("pgroup")) {
- pid_t pgroup;
+ rb_pid_t pgroup;
if (eargp->pgroup_given) {
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?)
*/
int ret;
- pid_t pgroup;
+ rb_pid_t pgroup;
pgroup = eargp->pgroup_pgid;
if (pgroup == -1)