Rely on e_os.h to appropriately define str[n]casecmp in non-POSIX

[openssl.git] / crypto / o_str.c

diff --git a/crypto/o_str.c b/crypto/o_str.c
index d626c98d0eb4d5102d4a80be11b90a041ea68d62..da8860491d69a5223ddee8d85a95ca06ad2ee98d 100644 (file)
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -57,13 +57,12 @@
  */
 
 #include <ctype.h>
-#include <strings.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);
@@ -79,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