X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fo_str.c;h=5a78f3250977adbb2ef50a1b6e4679c1dcaba96f;hp=174db3156e0afcee93d5bf36a59879054fc4ed77;hb=3b4de6e4cc91516f799849307be1204f6b5f2f4a;hpb=82384690e2ac49d6604d66bf5ac04c93f3e64a71

diff --git a/crypto/o_str.c b/crypto/o_str.c
index 174db3156e..5a78f32509 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -56,8 +56,12 @@
  *
  */
 
-#include <o_str.h>
-#include <openssl/e_os2.h>
+#include <ctype.h>
+#include <e_os.h>
+#include "o_str.h"
+
+#undef strncasecmp
+#undef strcasecmp
 
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	{
@@ -86,7 +90,7 @@ int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 int OPENSSL_strcasecmp(const char *str1, const char *str2)
 	{
 #if defined(OPENSSL_SYS_VMS)
-	return OSSL_strncasecmp(str1, str2, (size_t)-1);
+	return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
 #elif defined(OPENSSL_SYS_WINDOWS)
 	return _stricmp(str1, str2);
 #else