Windows build fix

Author: mtrojnar

src/eng_back.c

@@ -45,10 +45,6 @@ struct engine_ctx_st {
 	UTIL_CTX *util_ctx;
 };
 
-#if defined(_WIN32) || defined(_WIN64)
-#define strncasecmp _strnicmp
-#endif
-
 /******************************************************************************/
 /* Utility functions                                                          */
 /******************************************************************************/

src/p11_key.c

@@ -22,10 +22,6 @@
 #include <openssl/ui.h>
 #include <openssl/bn.h>
 
-#if defined(_WIN32) && !defined(strncasecmp)
-#define strncasecmp strnicmp
-#endif
-
 /* The maximum length of PIN */
 #define MAX_PIN_LENGTH   256
 

src/provider.c

@@ -35,6 +35,10 @@
 
 #include <ctype.h> /* isdigit() */
 
+#if defined(_WIN32) && !defined(strncasecmp)
+#define strncasecmp _strnicmp
+#endif
+
 #include <openssl/core.h>
 #include <openssl/core_dispatch.h>
 #include <openssl/core_names.h>

src/util_uri.c

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) && !defined(strncasecmp)
 #define strncasecmp _strnicmp
 #else
 #include <strings.h>