another warning.

[openssl.git] / crypto / dso / dso_win32.c

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 2b1ab2177d1059427d4aa76238ab8f0a05e6129a..212a255b4b387a75a1afdbf05c4fad1985713290 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "cryptlib.h"
 #include <openssl/dso.h>
 
@@ -118,8 +119,8 @@ static int win32_load(DSO *dso, const char *filename)
        len = strlen(filename);
        if((dso->flags & DSO_FLAG_NAME_TRANSLATION) &&
                        (len + 4 < DSO_MAX_TRANSLATED_SIZE) &&
-                       (strstr(filename, "/") == NULL)
-                       (strstr(filename, "\\") == NULL)
+                       (strstr(filename, "/") == NULL) &&
+                       (strstr(filename, "\\") == NULL) &&
                        (strstr(filename, ":") == NULL))
                {
                sprintf(translated, "%s.dll", filename);
@@ -210,7 +211,7 @@ static int win32_bind(DSO *dso, const char *symname, void **symptr)
        return(1);
        }
 
-static int win32_ctrl(DSO *dso, int cmd, long larg, void *parg)
+static long win32_ctrl(DSO *dso, int cmd, long larg, void *parg)
         {
         if(dso == NULL)
                 {