From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Thu, 14 Jan 2016 14:02:56 +0000 (+0100)
Subject: Windows shell: Remove unneeded Winsock code #4356
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1254^2~66
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7beb6f223449eca5026c670e129a878e9619c37f;p=nextcloud-desktop.git

Windows shell: Remove unneeded Winsock code #4356
---

diff --git a/shell_integration/windows/OCUtil/CommunicationSocket.cpp b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
index e848fbfd8..a4004f716 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 d1c07588c..014a85601 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>