Fixes so it will compile again under Win32.

5 files changed, 61 insertions, 14 deletions

diff --git a/Configure b/Configure
index 58fa5f204c..98644fb182 100755
--- a/Configure
+++ b/Configure
@@ -334,6 +334,8 @@ foreach (@ARGV)
 
 &usage if (!defined($table{$target}));
 
+my $IsWindows=scalar grep /^$target$/,@WinTargets;
+
 $openssldir="/usr/local/ssl" if ($openssldir eq "" and $installprefix eq "");
 $installprefix=$openssldir if $installprefix eq "";
 
@@ -343,7 +345,6 @@ chop $installprefix if $installprefix =~ /\/$/;
 $openssldir=$installprefix . "/ssl" if $openssldir eq "";
 $openssldir=$installprefix . "/" . $openssldir if $openssldir !~ /^\//;
 
-my $IsWindows=scalar grep /^$target$/,@WinTargets;
 
 print "IsWindows=$IsWindows\n";
 
@@ -548,18 +549,22 @@ if($IsWindows) {
 	open (OUT,">crypto/date.h") || die "Can't open date.h";
 	printf OUT "#define DATE \"%s\"\n", scalar gmtime();
 	close(OUT);
+} else {
+	(system 'make -f Makefile.ssl links') == 0 or exit $?;
+	&dofile("tools/c_rehash",$openssldir,'^DIR=',	'DIR=%s',);
+	&dofile("util/mk1mf.pl",$openssldir,
+				('^\$INSTALLTOP=','$INSTALLTOP="%s";',));
 }
 
-if (!$IsWindows)
-	{
-	(system 'make -f Makefile.ssl links') == 0 or exit $?;
-	}
 
-&dofile("tools/c_rehash",$openssldir,'^DIR=',	'DIR=%s',);
-&dofile("util/mk1mf.pl",$openssldir,('^\$INSTALLTOP=','$INSTALLTOP="%s";',));
+my $pwd;
 
-my $pwd=`pwd`;
-chop($pwd);
+if($IsWindows) {
+	$pwd="(include directory)";
+} else {
+	$pwd =`pwd`;
+	chop($pwd);
+}
 print <<EOF;
 
 NOTE: The OpenSSL header files have been moved from include/*.h
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();
diff --git a/util/libeay.num b/util/libeay.num
index 1038642eb8..5832d62643 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -1482,3 +1482,43 @@ X509V3_string_free                      1506
 X509V3_section_free                     1507
 X509V3_set_ctx                          1508
 s2i_ASN1_INTEGER                        1509
+CRYPTO_set_locked_mem_functions         1510
+CRYPTO_get_locked_mem_functions         1511
+CRYPTO_malloc_locked                    1512
+CRYPTO_free_locked                      1513
+BN_mod_exp2_mont                        1514
+ERR_get_error_line_data                 1515
+ERR_peek_error_line_data                1516
+PKCS12_PBE_keyivgen                     1517
+X509_ALGOR_dup                          1518
+sk_DIST_POINT_new                       1519
+sk_DIST_POINT_new_null                  1520
+sk_DIST_POINT_free                      1521
+sk_DIST_POINT_num                       1522
+sk_DIST_POINT_value                     1523
+sk_DIST_POINT_set                       1524
+sk_DIST_POINT_zero                      1525
+sk_DIST_POINT_push                      1526
+sk_DIST_POINT_pop                       1527
+sk_DIST_POINT_find                      1528
+sk_DIST_POINT_delete                    1529
+sk_DIST_POINT_delete_ptr                1530
+sk_DIST_POINT_set_cmp_func              1531
+sk_DIST_POINT_dup                       1532
+sk_DIST_POINT_pop_free                  1533
+sk_DIST_POINT_shift                     1534
+d2i_ASN1_SET_OF_DIST_POINT              1535
+i2d_ASN1_SET_OF_DIST_POINT              1536
+i2d_CRL_DIST_POINTS                     1537
+CRL_DIST_POINTS_new                     1538
+CRL_DIST_POINTS_free                    1539
+d2i_CRL_DIST_POINTS                     1540
+i2d_DIST_POINT                          1541
+DIST_POINT_new                          1542
+d2i_DIST_POINT                          1543
+DIST_POINT_free                         1544
+i2d_DIST_POINT_NAME                     1545
+DIST_POINT_NAME_new                     1546
+DIST_POINT_NAME_free                    1547
+d2i_DIST_POINT_NAME                     1548
+X509V3_add_value_uchar                  1549