Various Win32 and other fixes for warnings and compilation errors.

Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.

2 files changed, 2 insertions, 2 deletions

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 15813461f0..202371c9da 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -10,7 +10,7 @@ $OPTIONS="";
 $ssl_version="";
 $banner="\t\@echo Building OpenSSL";
 
-open(IN,"<Makefile.ssl") || die "unable to open Makefile.ssl!\n";
+open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $ssl_version=$1 if (/^VERSION=(.*)$/);
     $OPTIONS=$1 if (/^OPTIONS=(.*)$/);
diff --git a/util/mkfiles.pl b/util/mkfiles.pl
index d8cac3a3b4..f0daaecde7 100755
--- a/util/mkfiles.pl
+++ b/util/mkfiles.pl
@@ -62,7 +62,7 @@ my @dirs = (
 );
 
 foreach (@dirs) {
-	&files_dir ($_, "Makefile.ssl");
+	&files_dir ($_, "Makefile");
 }
 
 exit(0);