cleaning up strcasecmp

Author: manojampalam

contrib/win32/openssh/win32compat.vcxproj

@@ -149,7 +149,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\daemon.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\kerberos.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tnnet.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\win32auth.c" />

contrib/win32/openssh/win32compat.vcxproj.filters

@@ -51,9 +51,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\startupneeds.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\strcasecmp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\tncon.c">
       <Filter>Source Files</Filter>
     </ClCompile>

contrib/win32/win32compat/inc/unistd.h

@@ -27,26 +27,6 @@
 #define getdtablesize() MAX_FDS
 #define gethostname w32_gethostname
 
-#define fopen w32_fopen_utf8
-
 int daemon(int nochdir, int noclose);
 
-/* Compatibility header to avoid lots of #ifdefs in includes.h on Win32 */
-
-#include <conio.h>
-
-/* We can't put these in string.h since we can't easily override that header, so here they are */
-#if !defined(HAVE_STRCASECMP) && !defined(__MINGW32__)
-size_t strcasecmp(const char *left, const char *right);
-#endif
-
-#if !defined(HAVE_STRNCASECMP) && !defined(__MINGW32__)
-size_t strncasecmp(const char *left, const char *right, size_t n);
-#endif
-
-#define popen _popen
-#define pclose _pclose
-
-/* End of prototypes in the wrong file */
-
 #endif

contrib/win32/win32compat/inc/w32posix.h

@@ -163,3 +163,11 @@ struct iovec
 
 void
 explicit_bzero(void *b, size_t len);
+
+/* string.h overrides */
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+/* stdio.h overrides */
+#define fopen w32_fopen_utf8
+#define popen _popen
+#define pclose _pclose