diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-04-25 20:57:09 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-04-25 20:57:09 +0000 |
| commit | a1e464f94abb0ccfda284a96c358a5b32c7e72ac (patch) | |
| tree | 53e1dc3dce1024ac05332008350394396fdfdbef /crypto | |
| parent | c74b3a6037b329dbd9dfbaf1a103e2cc707ecdbc (diff) | |
Fixes so it will compile again under Win32.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/b_sock.c | 8 | ||||
| -rw-r--r-- | crypto/rand/md_rand.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vfy.h | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 328394efe4..b9f10f3438 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -199,8 +199,12 @@ int BIO_sock_error(int sock) int size; size=sizeof(int); - - i=getsockopt(sock,SOL_SOCKET,SO_ERROR,&j,&size); + /* Note: under Windows the third parameter is of type (char *) + * whereas under other systems it is (void *) if you don't have + * a cast it will choke the compiler: if you do have a cast then + * you can either go for (char *) or (void *). + */ + i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(void *)&j,&size); if (i < 0) return(1); else diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index f476e1ed5d..ab7e41c8ec 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -330,7 +330,7 @@ static void ssleay_rand_bytes(unsigned char *buf, int num) #ifdef WINDOWS #include <windows.h> -#include <rand.h> +#include <openssl/rand.h> /***************************************************************************** * Initialisation function for the SSL random generator. Takes the contents diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h index 060bc6093d..6ce521a998 100644 --- a/crypto/x509/x509_vfy.h +++ b/crypto/x509/x509_vfy.h @@ -273,7 +273,6 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m); X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void); X509_LOOKUP_METHOD *X509_LOOKUP_file(void); -X509_LOOKUP_METHOD *X509_LOOKUP_dir(void); int X509_STORE_add_cert(X509_STORE *ctx, X509 *x); int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); @@ -337,7 +336,6 @@ X509_LOOKUP *X509_STORE_add_lookup(); X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(); X509_LOOKUP_METHOD *X509_LOOKUP_file(); -X509_LOOKUP_METHOD *X509_LOOKUP_dir(); int X509_STORE_add_cert(); int X509_STORE_add_crl(); |