Fix mingw warnings.

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

diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 34b94b3d1df16d2cba05f041127a5d4996f74e4c..eea0b07c3c6bb23b8e84ab3e69caf3ded94a0584 100644 (file)
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -578,14 +578,14 @@ static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2
                }
        else
                {
-               filespec1_split = win32_splitter(dso, filespec1, 1);
+               filespec1_split = win32_splitter(dso, filespec1, 0);
                if (!filespec1_split)
                        {
                        DSOerr(DSO_F_WIN32_MERGER,
                                ERR_R_MALLOC_FAILURE);
                        return(NULL);
                        }
-               filespec2_split = win32_splitter(dso, filespec2, 0);
+               filespec2_split = win32_splitter(dso, filespec2, 1);
                if (!filespec2_split)
                        {
                        DSOerr(DSO_F_WIN32_MERGER,
@@ -826,7 +826,7 @@ static void *win32_globallookup(const char *name)
                }
 
        do      {
-               if (ret = GetProcAddress(me32.hModule,name))
+               if ((ret = GetProcAddress(me32.hModule,name)))
                        {
                        (*close_snap)(hModuleSnap);
                        FreeLibrary(dll);