From 976eb6ee3bf7f948b6a1c11e15a7f26e1d01aa6a Mon Sep 17 00:00:00 2001
From: manojampalam <manojampalam@live.com>
Date: Mon, 21 Mar 2016 21:55:37 -0700
Subject: [PATCH] More Win #defs removed from bsdcompat project

---
 contrib/win32/openssh/openbsd_compat.vcxproj         | 3 ---
 contrib/win32/openssh/openbsd_compat.vcxproj.filters | 9 ---------
 openbsd-compat/getopt_long.c                         | 4 ----
 openbsd-compat/getrrsetbyname.c                      | 3 ---
 openbsd-compat/glob.c                                | 4 ----
 openbsd-compat/port-aix.c                            | 3 ---
 6 files changed, 26 deletions(-)

diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj b/contrib/win32/openssh/openbsd_compat.vcxproj
index ba2dbce..bd56a2b 100644
--- a/contrib/win32/openssh/openbsd_compat.vcxproj
+++ b/contrib/win32/openssh/openbsd_compat.vcxproj
@@ -50,8 +50,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getopt.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getopt_long.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getrrsetbyname-ldns.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getrrsetbyname.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\glob.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\inet_aton.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\inet_ntoa.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\inet_ntop.c" />
@@ -59,7 +57,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\md5.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\mktemp.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\openssl-compat.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-aix.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-linux.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-solaris.c" />
diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj.filters b/contrib/win32/openssh/openbsd_compat.vcxproj.filters
index 826f9eb..40d4db7 100644
--- a/contrib/win32/openssh/openbsd_compat.vcxproj.filters
+++ b/contrib/win32/openssh/openbsd_compat.vcxproj.filters
@@ -105,12 +105,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getrrsetbyname-ldns.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\getrrsetbyname.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\glob.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\inet_aton.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -132,9 +126,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\openssl-compat.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-aix.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/openbsd-compat/getopt_long.c b/openbsd-compat/getopt_long.c
index 8b10fad..e289474 100644
--- a/openbsd-compat/getopt_long.c
+++ b/openbsd-compat/getopt_long.c
@@ -70,10 +70,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifdef WIN32_FIXME
-#include <getopt.h>
-#endif
-
 #include "log.h"
 
 int	opterr = 1;		/* if error message should be printed */
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 0e0b753..05e7a84 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -47,8 +47,6 @@
 
 #include "includes.h"
 
-#ifndef WIN32_FIXME
-
 #if !defined (HAVE_GETRRSETBYNAME) && !defined (HAVE_LDNS)
 
 #include <stdlib.h>
@@ -611,4 +609,3 @@ count_dns_rr(struct dns_rr *p, u_int16_t class, u_int16_t type)
 
 #endif /*  !defined (HAVE_GETRRSETBYNAME) && !defined (HAVE_LDNS) */
 
-#endif /* !WIN32_FIXME */
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index de44737..742b4b9 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -60,8 +60,6 @@
 
 #include "includes.h"
 
-#ifndef WIN32_FIXME
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -1065,5 +1063,3 @@ qprintf(const char *str, Char *s)
 
 #endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) ||
           !defined(GLOB_HAS_GL_MATCHC) || !defined(GLOB_HAS_GL_STATV) */
-		  
-#endif /* WIN32_FIXME */
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 90dabeb..9ca562f 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -26,8 +26,6 @@
  */
 #include "includes.h"
 
-#ifndef WIN32_FIXME
-
 #include "xmalloc.h"
 #include "buffer.h"
 #include "key.h"
@@ -473,4 +471,3 @@ out:
 
 #endif /* _AIX */
 
-#endif