oops, reinstate correct prototype

[openssl.git] / crypto / o_str.c

diff --git a/crypto/o_str.c b/crypto/o_str.c
index 174db3156e0afcee93d5bf36a59879054fc4ed77..56104a6c34ba9c1db5cd9ef7a0d904dcc75653b0 100644 (file)
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -56,12 +56,19 @@
  *
  */
 
-#include <o_str.h>
-#include <openssl/e_os2.h>
+#include <ctype.h>
+#include <e_os.h>
+#include "o_str.h"
+
+#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \
+    !defined(OPENSSL_SYSNAME_WIN32) && \
+    !defined(NETWARE_CLIB)
+# include <strings.h>
+#endif
 
 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);
@@ -77,20 +84,28 @@ 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
        }
 
+int OPENSSL_memcmp(const void *v1,const void *v2,size_t n)
+       {
+       const unsigned char *c1=v1,*c2=v2;
+       int ret=0;
+
+       while(n && (ret=*c1-*c2)==0) n--,c1++,c2++;
+
+       return ret;
+       }