kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Revert "get rid of a compiler warning of VC"

Browse source 
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
This commit is contained in:
normal 2018-07-05 03:20:20 +00:00
parent 44fc3d08eb
commit 4c777ac94e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mjit.c
View file

@ -422,8 +422,8 @@ exec_process(const char *path, char *const argv[])
: waitpid(pid, &stat, 0); : waitpid(pid, &stat, 0);
if (r == -1) { if (r == -1) {
if (errno == EINTR) continue; if (errno == EINTR) continue;
fprintf(stderr, "[%"PRI_PIDT_PREFIX"d] waitpid(%"PRI_PIDT_PREFIX"d): %s (SIGCHLD=%d,%u)\n", fprintf(stderr, "[%"PRI_PIDT_PREFIX"d] waitpid(%lu): %s (SIGCHLD=%d,%u)\n",
getpid(), pid, strerror(errno), getpid(), (unsigned long)pid, strerror(errno),
RUBY_SIGCHLD, SIGCHLD_LOSSY); RUBY_SIGCHLD, SIGCHLD_LOSSY);
break; break;
} }

2
win32/Makefile.sub
View file

@ -760,7 +760,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define ssize_t int #define ssize_t int
!endif !endif
#define PRI_LL_PREFIX "I64" #define PRI_LL_PREFIX "I64"
#define PRI_PIDT_PREFIX "I" #define PRI_PIDT_PREFIX PRI_INT_PREFIX
#define GETGROUPS_T int #define GETGROUPS_T int
#define RETSIGTYPE void #define RETSIGTYPE void
#define TYPEOF_TIMEVAL_TV_SEC long #define TYPEOF_TIMEVAL_TV_SEC long