normal	2018-07-05 12:20:20 +0900 (Thu, 05 Jul 2018)

  New Revision: 63856

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63856

  Log:
    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.

  Modified files:
    trunk/mjit.c
    trunk/win32/Makefile.sub
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 63855)
+++ win32/Makefile.sub	(revision 63856)
@@ -760,7 +760,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/ https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L760
 #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
Index: mjit.c
===================================================================
--- mjit.c	(revision 63855)
+++ mjit.c	(revision 63856)
@@ -422,8 +422,8 @@ exec_process(const char *path, char *con https://github.com/ruby/ruby/blob/trunk/mjit.c#L422
                      : 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;
         }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/