From d0e1774a5850b924915bde5abefe791ce18d84a2 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 22 Jul 2016 20:38:22 +0300
Subject: [PATCH] Fix compilation warning in the MinGW build

* nt/inc/ms-w32.h: Include stdint.h.
(_execvp, execve): Provide prototypes.

* lib-src/emacsclient.c [WINDOWSNT]: Remove prototype for execvp,
it is now in nt/inc/ms-w32.h.
* lib-src/ntlib.c (getppid): Avoid compiler warnings due to format
mismatch.
(sys_ctime): Remove, not used.
---
 lib-src/emacsclient.c |  1 -
 lib-src/ntlib.c       | 14 ++------------
 nt/inc/ms-w32.h       |  3 +++
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 7792d0a2c74..1991aaa9c02 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -388,7 +388,6 @@ w32_window_app (void)
   directly into the argv array of the child process.  */
 
 int w32_execvp (const char *, char **);
-extern int execvp (const char*, char **);
 
 int
 w32_execvp (const char *path, char **argv)
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 2ace218f823..2ac021936ae 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -98,7 +98,7 @@ getppid (void)
       getppid_parent = OpenProcess (SYNCHRONIZE, FALSE, atoi (ppid));
       if (!getppid_parent)
 	{
-	  printf ("Failed to open handle to parent process: %d\n",
+	  printf ("Failed to open handle to parent process: %lu\n",
 		 GetLastError ());
 	  exit (1);
 	}
@@ -115,7 +115,7 @@ getppid (void)
       return 1;
     case WAIT_FAILED:
     default:
-      printf ("Checking parent status failed: %d\n", GetLastError ());
+      printf ("Checking parent status failed: %lu\n", GetLastError ());
       exit (1);
     }
 }
@@ -258,16 +258,6 @@ fchown (int fd, unsigned uid, unsigned gid)
   return 0;
 }
 
-/* Place a wrapper around the MSVC version of ctime.  It returns NULL
-   on network directories, so we handle that case here.
-   (Ulrich Leodolter, 1/11/95).  */
-char *
-sys_ctime (const time_t *t)
-{
-  char *str = (char *) ctime (t);
-  return (str ? str : "Sun Jan 01 00:00:00 1970");
-}
-
 FILE *
 sys_fopen (const char * path, const char * mode)
 {
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index 5fd54e2f926..bb8ae6ad8f9 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -291,6 +291,9 @@ extern int sys_umask (int);
 /* Map to MSVC names.  */
 #define execlp    _execlp
 #define execvp    _execvp
+#include <stdint.h>		/* for intptr_t */
+extern intptr_t _execvp (const char *, char **);
+extern intptr_t execve (const char *, char * const *, char * const *);
 #define fdatasync _commit
 #define fdopen	  _fdopen
 #define fsync	  _commit
-- 
2.39.2