X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fo_str.c;h=da8860491d69a5223ddee8d85a95ca06ad2ee98d;hp=efe20b77a9c28191ec44ebc6982b1f1c20d77187;hb=e6d27baf5277eeec8f30c2edce52b8baabebb574;hpb=f0c5db92f76d5be7639f78215a2190db56111602;ds=sidebyside

diff --git a/crypto/o_str.c b/crypto/o_str.c
index efe20b77a9..da8860491d 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -56,13 +56,13 @@
  *
  */
 
-#include <strings.h>
+#include <ctype.h>
+#include <e_os.h>
 #include "o_str.h"
-#include <openssl/e_os2.h>
 
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	{
-#if defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
 	while (*str1 && *str2 && n)
 		{
 		int res = toupper(*str1) - toupper(*str2);
@@ -78,18 +78,17 @@ int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	if (*str2)
 		return -1;
 	return 0;
-#elif defined(OPENSSL_SYS_WINDOWS)
-	return _strnicmp(str1, str2, n);
 #else
+	/* Recursion hazard warning! Whenever strncasecmp is #defined as
+	 * OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be
+	 * defined as well. */
 	return strncasecmp(str1, str2, n);
 #endif
 	}
 int OPENSSL_strcasecmp(const char *str1, const char *str2)
 	{
-#if defined(OPENSSL_SYS_VMS)
-	return OSSL_strncasecmp(str1, str2, (size_t)-1);
-#elif defined(OPENSSL_SYS_WINDOWS)
-	return _stricmp(str1, str2);
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
+	return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
 #else
 	return strcasecmp(str1, str2);
 #endif