From 44c5be48835b6e45336d48e42e899294d0e35c51 Mon Sep 17 00:00:00 2001 From: manojampalam Date: Sat, 5 Mar 2016 15:11:04 -0800 Subject: [PATCH] 3-5 C4 --- contrib/win32/openssh/Win32-OpenSSH.sln | 4 ++++ contrib/win32/openssh/win32compatUnittests.vcxproj | 2 +- contrib/win32/win32compat/w32fd.c | 4 +--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/win32/openssh/Win32-OpenSSH.sln b/contrib/win32/openssh/Win32-OpenSSH.sln index e1f9691..3f69841 100644 --- a/contrib/win32/openssh/Win32-OpenSSH.sln +++ b/contrib/win32/openssh/Win32-OpenSSH.sln @@ -111,6 +111,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scp", "scp.vcxproj", "{29B9 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32compatUnittests", "win32compatUnittests.vcxproj", "{780CAFE4-4BC5-407B-B3A6-71C4114826A7}" + ProjectSection(ProjectDependencies) = postProject + {05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7} + {8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/contrib/win32/openssh/win32compatUnittests.vcxproj b/contrib/win32/openssh/win32compatUnittests.vcxproj index adffa02..df899ad 100644 --- a/contrib/win32/openssh/win32compatUnittests.vcxproj +++ b/contrib/win32/openssh/win32compatUnittests.vcxproj @@ -80,7 +80,7 @@ false $(Platform)\$(Configuration)\$(TargetName)\ - ssh + win32compatUnittests $(OpenSSH-Bin-Path)$(Platform)\$(Configuration)\ diff --git a/contrib/win32/win32compat/w32fd.c b/contrib/win32/win32compat/w32fd.c index a05f428..b3b0c2e 100644 --- a/contrib/win32/win32compat/w32fd.c +++ b/contrib/win32/win32compat/w32fd.c @@ -92,15 +92,13 @@ fd_table_clear(int index) void w32posix_initialize() { - if ((debug_initialize() != 0) - || (fd_table_initialize() != 0) + if ( (fd_table_initialize() != 0) || (socketio_initialize() != 0)) abort(); } void w32posix_done() { - debug_done(); socketio_done(); }