From 0ec4dbaae2d388d647eb112f3d6fac0cbcaf0186 Mon Sep 17 00:00:00 2001
From: manojampalam <manojampalam@live.com>
Date: Sun, 6 Mar 2016 12:17:48 -0800
Subject: [PATCH] 3-6 C3

Removing winsock2 header from ssh-lsa source
---
 contrib/win32/win32compat/lsa/Base64.cpp    | 2 +-
 contrib/win32/win32compat/lsa/Debug.h       | 2 +-
 contrib/win32/win32compat/lsa/DeskRight.h   | 2 +-
 contrib/win32/win32compat/lsa/Key.cpp       | 4 ++--
 contrib/win32/win32compat/lsa/Key.h         | 2 +-
 contrib/win32/win32compat/lsa/KeyAuth.h     | 4 ++--
 contrib/win32/win32compat/lsa/LsaString.cpp | 4 ++--
 contrib/win32/win32compat/lsa/LsaString.h   | 2 +-
 contrib/win32/win32compat/lsa/PopBinary.h   | 4 ++--
 contrib/win32/win32compat/lsa/Ssh-lsa.cpp   | 4 ++--
 contrib/win32/win32compat/lsa/Ssh-lsa.h     | 2 +-
 contrib/win32/win32compat/lsa/Win64Fix.h    | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/contrib/win32/win32compat/lsa/Base64.cpp b/contrib/win32/win32compat/lsa/Base64.cpp
index b21fad1..67a6fdb 100644
--- a/contrib/win32/win32compat/lsa/Base64.cpp
+++ b/contrib/win32/win32compat/lsa/Base64.cpp
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <winsock2.h>
+
 #include "Base64.h"
 
 //
diff --git a/contrib/win32/win32compat/lsa/Debug.h b/contrib/win32/win32compat/lsa/Debug.h
index b54ffc9..8750a60 100644
--- a/contrib/win32/win32compat/lsa/Debug.h
+++ b/contrib/win32/win32compat/lsa/Debug.h
@@ -34,7 +34,7 @@
 
 #undef STRING
 
-#include <winsock2.h>
+
 #include <windows.h>
 #include "Types.h"
 
diff --git a/contrib/win32/win32compat/lsa/DeskRight.h b/contrib/win32/win32compat/lsa/DeskRight.h
index 7224957..f9929f1 100644
--- a/contrib/win32/win32compat/lsa/DeskRight.h
+++ b/contrib/win32/win32compat/lsa/DeskRight.h
@@ -33,7 +33,7 @@
 #define DeskRight_H
 
 #include "Debug.h"
-#include <winsock2.h>
+
 #include <windows.h>
 
 #define ADD_RIGHT    1
diff --git a/contrib/win32/win32compat/lsa/Key.cpp b/contrib/win32/win32compat/lsa/Key.cpp
index a47dc74..c39e664 100644
--- a/contrib/win32/win32compat/lsa/Key.cpp
+++ b/contrib/win32/win32compat/lsa/Key.cpp
@@ -30,13 +30,13 @@
  */
 
 #ifdef __VS_BUILD__
-#include <winsock2.h>
+
 #include <Windows.h>
 #include <LsaLookup.h>
 #include <Ntsecapi.h>
 #endif
 
-#include <winsock2.h>
+
 #include "Key.h"
 
 #ifdef __VS_BUILD__
diff --git a/contrib/win32/win32compat/lsa/Key.h b/contrib/win32/win32compat/lsa/Key.h
index 2fe4b4e..dd5879a 100644
--- a/contrib/win32/win32compat/lsa/Key.h
+++ b/contrib/win32/win32compat/lsa/Key.h
@@ -50,7 +50,7 @@
 #include <cstring>
 #include <cstdio>
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include <NTSecPkg.h>
diff --git a/contrib/win32/win32compat/lsa/KeyAuth.h b/contrib/win32/win32compat/lsa/KeyAuth.h
index e954b97..adacde9 100644
--- a/contrib/win32/win32compat/lsa/KeyAuth.h
+++ b/contrib/win32/win32compat/lsa/KeyAuth.h
@@ -36,14 +36,14 @@
 
 #ifdef __VS_BUILD__
 #define UMDF_USING_NTSTATUS 
-#include <winsock2.h>
+
 #include <Windows.h>
 #include <LsaLookup.h>
 #include <Ntsecapi.h>
 #endif
 
 
-#include <winsock2.h>
+
 
 #include "Win64Fix.h"
 
diff --git a/contrib/win32/win32compat/lsa/LsaString.cpp b/contrib/win32/win32compat/lsa/LsaString.cpp
index f3200c9..68aebac 100644
--- a/contrib/win32/win32compat/lsa/LsaString.cpp
+++ b/contrib/win32/win32compat/lsa/LsaString.cpp
@@ -31,13 +31,13 @@
 
 #ifdef __VS_BUILD__
 #define UMDF_USING_NTSTATUS 
-#include <winsock2.h>
+
 #include <Windows.h>
 #include <LsaLookup.h>
 #include <Ntsecapi.h>
 #endif
 
-#include <winsock2.h>
+
 #include "LsaString.h"
 
 #ifdef __VS_BUILD__
diff --git a/contrib/win32/win32compat/lsa/LsaString.h b/contrib/win32/win32compat/lsa/LsaString.h
index aac887e..001a28d 100644
--- a/contrib/win32/win32compat/lsa/LsaString.h
+++ b/contrib/win32/win32compat/lsa/LsaString.h
@@ -40,7 +40,7 @@
 
 #include <stdio.h>
 #include <wchar.h>
-#include <winsock2.h>
+
 #include <windows.h>
 #include <Ntsecapi.h>
 #include <NTSecPkg.h>
diff --git a/contrib/win32/win32compat/lsa/PopBinary.h b/contrib/win32/win32compat/lsa/PopBinary.h
index c7fba88..bfa2db5 100644
--- a/contrib/win32/win32compat/lsa/PopBinary.h
+++ b/contrib/win32/win32compat/lsa/PopBinary.h
@@ -36,13 +36,13 @@
 
 #ifdef __VS_BUILD__
 #define UMDF_USING_NTSTATUS 
-#include <winsock2.h>
+
 #include <Windows.h>
 #include <LsaLookup.h>
 #include <Ntsecapi.h>
 #endif
 
-#include <winsock2.h>
+
 
 #include "Win64Fix.h"
 
diff --git a/contrib/win32/win32compat/lsa/Ssh-lsa.cpp b/contrib/win32/win32compat/lsa/Ssh-lsa.cpp
index 17e49ac..da069bd 100644
--- a/contrib/win32/win32compat/lsa/Ssh-lsa.cpp
+++ b/contrib/win32/win32compat/lsa/Ssh-lsa.cpp
@@ -33,14 +33,14 @@
 
 #ifdef __VS_BUILD__
 #define UMDF_USING_NTSTATUS 
-#include <winsock2.h>
+
 #include <Windows.h>
 #include <LsaLookup.h>
 #include <Ntsecapi.h>
 #endif
 
 
-#include <winsock2.h>
+
 #include "Ssh-lsa.h"
 
 #ifdef __cplusplus
diff --git a/contrib/win32/win32compat/lsa/Ssh-lsa.h b/contrib/win32/win32compat/lsa/Ssh-lsa.h
index e411b5f..b4faff1 100644
--- a/contrib/win32/win32compat/lsa/Ssh-lsa.h
+++ b/contrib/win32/win32compat/lsa/Ssh-lsa.h
@@ -37,7 +37,7 @@
 
 #include "Win64Fix.h"
 
-#include <winsock2.h>
+
 #include <windows.h>
 
 #include <NTSecPkg.h>
diff --git a/contrib/win32/win32compat/lsa/Win64Fix.h b/contrib/win32/win32compat/lsa/Win64Fix.h
index 5de03f1..449f8c4 100644
--- a/contrib/win32/win32compat/lsa/Win64Fix.h
+++ b/contrib/win32/win32compat/lsa/Win64Fix.h
@@ -34,7 +34,7 @@
 
 #undef STRING
 
-#include <winsock2.h>
+
 #include <windows.h>
   
 #define SECURITY_WIN32