aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-19 10:51:49 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-19 10:51:49 +0000
commitd617690a65f82eeb82c8bdb1bec8f07be8f8979e (patch)
tree8f1fd5e3a3c0f77a87f969b7f3b12bb5c11ef706
parente0b74f8a4d44c7f4304f89b99d4a26cc3c295a76 (diff)
downloadruby-d617690a65f82eeb82c8bdb1bec8f07be8f8979e.tar.gz
* ruby_kill (internal.h, thread.c): use rb_pid_t instead of pid_t.
this fixes the build failure of mswin introduced at r39819. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--internal.h2
-rw-r--r--thread.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 97e6a25d4c..fca5dae5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 19 19:50:48 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ruby_kill (internal.h, thread.c): use rb_pid_t instead of pid_t.
+ this fixes the build failure of mswin introduced at r39819.
+
Tue Mar 19 17:09:30 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_conv_enc_opts): convert with one converter, instead
diff --git a/internal.h b/internal.h
index 65ce5203ef..3fa07b41a0 100644
--- a/internal.h
+++ b/internal.h
@@ -308,7 +308,7 @@ VALUE rb_thread_shield_destroy(VALUE self);
void rb_mutex_allow_trap(VALUE self, int val);
VALUE rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data);
VALUE rb_mutex_owned_p(VALUE self);
-void ruby_kill(pid_t pid, int sig);
+void ruby_kill(rb_pid_t pid, int sig);
/* thread_pthread.c, thread_win32.c */
void Init_native_thread(void);
diff --git a/thread.c b/thread.c
index 7e38ce40b9..37e805358a 100644
--- a/thread.c
+++ b/thread.c
@@ -5204,7 +5204,7 @@ rb_uninterruptible(VALUE (*b_proc)(ANYARGS), VALUE data)
}
void
-ruby_kill(pid_t pid, int sig)
+ruby_kill(rb_pid_t pid, int sig)
{
int err;
rb_thread_t *th = GET_THREAD();