Win32 fixes:

define LLONG properly for VC++.

stop compiler complaining about signed/unsigned mismatch in apps/engine.c

diff --git a/apps/engine.c b/apps/engine.c
index d33aa7ebb669b8ce5b324abd15b35f27cc3da24a..31221ed867997bf1ea8890be48db44c06963968b 100644 (file)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -237,8 +237,8 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent
                if(verbose == 1)
                        {
                        /* We're just listing names, comma-delimited */
-                       if((xpos > strlen(indent)) &&
-                                       (xpos + strlen(name) > line_wrap))
+                       if((xpos > (int)strlen(indent)) &&
+                                       (xpos + (int)strlen(name) > line_wrap))
                                {
                                BIO_printf(bio_out, "\n");
                                xpos = BIO_printf(bio_out, indent);

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 40070fbbde4080ce452450480ca997e7a8d2f469..3b0edcf3d0ebad8edc31899ee3f1cff869435ef5 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -109,7 +109,11 @@
 #endif
 
 #if HAVE_LONG_LONG
-#define LLONG long long
+# if defined(OPENSSL_SYS_WIN32) && !defined(__GNUC__)
+# define LLONG _int64
+# else
+# define LLONG long long
+# endif
 #else
 #define LLONG long
 #endif