summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2004-03-17 01:21:11 +0000
committerDr. Stephen Henson <steve@openssl.org>2004-03-17 01:21:11 +0000
commitc08c1f76bca6d18d9eb9b80dcd8f434c8ef4f1c6 (patch)
tree913fbcae10b358e8c5ab9fc4efe25d8ae92d310f
parent29348d3c5c8371b8dc821b19925fb116269a3932 (diff)
Win32 fixes.
-rw-r--r--apps/asn1pars.c2
-rw-r--r--crypto/bio/bss_bio.c2
-rw-r--r--crypto/des/cfb_enc.c2
3 files changed, 3 insertions, 3 deletions
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.