From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 17 Mar 2004 01:05:42 +0000 (+0000)
Subject: Win32 fixes.
X-Git-Tag: OpenSSL_0_9_6m~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8b3b01a2d4a8884904172d046dc032b8ee5c5109;p=oweals%2Fopenssl.git

Win32 fixes.
---

diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 4ec6ec2741..61fede1ab9 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -309,7 +309,7 @@ bad:
 
 	num -= offset;
 
-	if ((length == 0) || (length > num)) length=(unsigned int)num;
+	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
 	if(derout) {
 		if(BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 1f547863f5..4a794bfb66 100644
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -84,7 +84,7 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
 
-#include "e_os.h"
+#include "openssl/e_os.h"
 
 /* VxWorks defines SSiZE_MAX with an empty value causing compile errors */
 #if defined(VXWORKS)
diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 74f6b9d04f..73ad33022e 100644
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "e_os.h"
+#include "openssl/e_os.h"
 #include "des_locl.h"
 
 /* The input and output are loaded in multiples of 8 bits.