Win32 fixes:
authorDr. Stephen Henson <steve@openssl.org>
Sun, 29 Apr 2001 16:30:59 +0000 (16:30 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 29 Apr 2001 16:30:59 +0000 (16:30 +0000)
define LLONG properly for VC++.

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

apps/engine.c
crypto/bio/b_print.c

index d33aa7e..31221ed 100644 (file)
@@ -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);
index 40070fb..3b0edcf 100644 (file)
 #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