diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-05 03:20:20 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-05 03:20:20 +0000 |
commit | 4c777ac94eaa423969678a09ed5305240219c796 (patch) | |
tree | 0fe03eaae9d675ef4f10373f7a541e2a26394ec9 | |
parent | 44fc3d08eb3cb52df5bdd91a0d9723718654b349 (diff) | |
download | ruby-4c777ac94eaa423969678a09ed5305240219c796.tar.gz |
Revert "get rid of a compiler warning of VC"
Partially revert r63820. mjit.c seems to have different idea of
"pid" type/size than the rest of Ruby on win32.
As noted in [ruby-core:87794], this seems to break Greg's build.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | mjit.c | 4 | ||||
-rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -422,8 +422,8 @@ exec_process(const char *path, char *const argv[]) : waitpid(pid, &stat, 0); if (r == -1) { if (errno == EINTR) continue; - fprintf(stderr, "[%"PRI_PIDT_PREFIX"d] waitpid(%"PRI_PIDT_PREFIX"d): %s (SIGCHLD=%d,%u)\n", - getpid(), pid, strerror(errno), + fprintf(stderr, "[%"PRI_PIDT_PREFIX"d] waitpid(%lu): %s (SIGCHLD=%d,%u)\n", + getpid(), (unsigned long)pid, strerror(errno), RUBY_SIGCHLD, SIGCHLD_LOSSY); break; } diff --git a/win32/Makefile.sub b/win32/Makefile.sub index fd852c21b7..20b47a581a 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -760,7 +760,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define ssize_t int !endif #define PRI_LL_PREFIX "I64" -#define PRI_PIDT_PREFIX "I" +#define PRI_PIDT_PREFIX PRI_INT_PREFIX #define GETGROUPS_T int #define RETSIGTYPE void #define TYPEOF_TIMEVAL_TV_SEC long |