[Pkg-owncloud-commits] [owncloud-client] 111/171: Windows shell: Remove unneeded Winsock code #4356

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 7beb6f223449eca5026c670e129a878e9619c37f
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Thu Jan 14 15:02:56 2016 +0100

    Windows shell: Remove unneeded Winsock code #4356
---
 shell_integration/windows/OCUtil/CommunicationSocket.cpp | 4 ----
 shell_integration/windows/OCUtil/OCUtil.vcxproj          | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/shell_integration/windows/OCUtil/CommunicationSocket.cpp b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
index e848fbf..a4004f7 100644
--- a/shell_integration/windows/OCUtil/CommunicationSocket.cpp
+++ b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
@@ -18,9 +18,6 @@
 #include "UtilConstants.h"
 #include "StringUtil.h"
 
-#include <WinSock2.h>
-#include <Ws2def.h>
-#include <windows.h>
 #include <iostream>
 #include <vector>
 #include <array>
@@ -45,7 +42,6 @@ CommunicationSocket::~CommunicationSocket()
 
 bool CommunicationSocket::Close()
 {
-	WSACleanup();
 	if (_pipe == INVALID_HANDLE_VALUE) {
 		return false;
 	}
diff --git a/shell_integration/windows/OCUtil/OCUtil.vcxproj b/shell_integration/windows/OCUtil/OCUtil.vcxproj
index d1c0758..014a856 100644
--- a/shell_integration/windows/OCUtil/OCUtil.vcxproj
+++ b/shell_integration/windows/OCUtil/OCUtil.vcxproj
@@ -143,7 +143,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
   </ItemDefinitionGroup>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git