diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-18 04:13:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-18 04:13:09 +0000 |
| commit | adbd40a44c989645df48bf570132b5415b7dd393 (patch) | |
| tree | 765bda387c202be5cf3db52886842b7d79ba29f7 /win32 | |
| parent | b90a81ec76df8afe9b0b515aa2fa2140a6a8554c (diff) | |
| download | ruby-adbd40a44c989645df48bf570132b5415b7dd393.tar.gz ruby-adbd40a44c989645df48bf570132b5415b7dd393.tar.xz ruby-adbd40a44c989645df48bf570132b5415b7dd393.zip | |
* configure.in (pid_t, uid_t, gid_t): check if defined.
* intern.h, process.c, rubyio.h, ext/etc/etc.c, ext/pty/pty.c: use
rb_{pid,uid,gid}_t instead of plain int. [ruby-dev:30376]
* ext/etc/extconf.rb (PIDT2NUM, NUM2PIDT, UIDT2NUM, NUM2UIDT, GIDT2NUM,
NUM2GIDT): moved to configure.in.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 6 | ||||
| -rw-r--r-- | win32/win32.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/win32/win32.c b/win32/win32.c index 827af77b5..0554c4206 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -840,7 +840,7 @@ rb_w32_pipe_exec(const char *cmd, const char *prog, int mode, int *pipe) return ret; } -int +rb_pid_t rb_w32_spawn(int mode, const char *cmd, const char *prog) { struct ChildRecord *child; @@ -877,7 +877,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog) } } -int +rb_pid_t rb_w32_aspawn(int mode, const char *prog, char *const *argv) { int len = rb_w32_argv_size(argv); @@ -2952,7 +2952,7 @@ poll_child_status(struct ChildRecord *child, int *stat_loc) } rb_pid_t -waitpid (rb_pid_t pid, int *stat_loc, int options) +waitpid(rb_pid_t pid, int *stat_loc, int options) { DWORD timeout; diff --git a/win32/win32.h b/win32/win32.h index 4957bae0a..dccb63d11 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -229,8 +229,8 @@ extern int gettimeofday(struct timeval *, struct timezone *); extern rb_pid_t waitpid (rb_pid_t, int *, int); extern int rb_w32_argv_size(char *const *); extern char *rb_w32_join_argv(char *, char *const *); -extern int rb_w32_spawn(int, const char *, const char*); -extern int rb_w32_aspawn(int, const char *, char *const *); +extern rb_pid_t rb_w32_spawn(int, const char *, const char*); +extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *); extern int kill(int, int); extern int fcntl(int, int, ...); extern rb_pid_t rb_w32_getpid(void); |