Porting latest openssh/master changes to Windows

This commit is contained in:
Manoj Ampalam 2017-06-07 22:04:05 -07:00
parent f7e6475b96
commit 849b637a7e
3 changed files with 4 additions and 2 deletions

View File

@ -30,6 +30,7 @@
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-closefrom.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-cray.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-cygwin_util.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-getpagesize.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-getpeereid.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-misc.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-nextstep.c" />
@ -62,6 +63,7 @@
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-uw.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\readpassphrase.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\reallocarray.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\recallocarray.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\rmd160.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\rresvport.c" />
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\setenv.c" />

View File

@ -78,7 +78,7 @@ int daemon(int nochdir, int noclose);
char *crypt(const char *key, const char *salt);
int link(const char *oldpath, const char *newpath);
int readlink(const char *path, char *link, int linklen);
int spawn_child(char*, char**, int, int, int, DWORD);
int spawn_child(char*, char**, int, int, int, unsigned long);
/*
* readpassphrase.h definitions

View File

@ -899,7 +899,7 @@ w32_fsync(int fd)
* this decoration is done only when additional arguments are passed in argv
*/
int
spawn_child(char* cmd, char** argv, int in, int out, int err, DWORD flags)
spawn_child(char* cmd, char** argv, int in, int out, int err, unsigned long flags)
{
PROCESS_INFORMATION pi;
STARTUPINFOW si;