From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 29 Apr 2001 16:30:59 +0000 (+0000)
Subject: Win32 fixes:
X-Git-Tag: OpenSSL_0_9_6c~182^2~209
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c2e45f6ddf9219735e85d9b658a94e42c37ec0a2;p=oweals%2Fopenssl.git

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 d33aa7ebb6..31221ed867 100644
--- 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 40070fbbde..3b0edcf3d0 100644
--- 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