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.
This commit is contained in:
parent
ad90397c59
commit
d0e1774a58
3 changed files with 5 additions and 13 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue