aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2001-04-29 16:30:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2001-04-29 16:30:59 +0000
commitc2e45f6ddf9219735e85d9b658a94e42c37ec0a2 (patch)
tree2a7d5b13659f6a1943f6452e931e3f946eb12eb5
parentf9a4ad4fa6747e0b1c2d8660707ae43e04f1157b (diff)
downloadopenssl-c2e45f6ddf9219735e85d9b658a94e42c37ec0a2.tar.gz
Win32 fixes:
define LLONG properly for VC++. stop compiler complaining about signed/unsigned mismatch in apps/engine.c
-rw-r--r--apps/engine.c4
-rw-r--r--crypto/bio/b_print.c6
2 files changed, 7 insertions, 3 deletions
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