From 70857a4a004dd10345e6c8397734bda4dc4bdad7 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Tue, 1 Jul 2014 14:11:28 +0100
Subject: [PATCH] Windows build fixes.

---
 e_os.h        | 1 +
 util/mk1mf.pl | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/e_os.h b/e_os.h
index 4440ac28d7..67638f7534 100644
--- a/e_os.h
+++ b/e_os.h
@@ -134,6 +134,7 @@ extern "C" {
 #endif
 
 #ifdef WIN32
+#define NO_SYS_UN_H
 #define get_last_sys_error()	GetLastError()
 #define clear_sys_error()	SetLastError(0)
 #if !defined(WINNT)
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index b05c4aeed4..a550523b62 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -617,6 +617,8 @@ EOF
 	$ex_libs .= " $zlib_lib" if $zlib_opt == 1;
 	}
 
+my $asm_def = $orig_platform eq 'copy' ? "" : "ASM=$bin_dir$asm";
+
 $defs= <<"EOF";
 # N.B. You MUST use -j on FreeBSD.
 # This makefile has been automatically generated from the OpenSSL distribution.
@@ -677,7 +679,7 @@ RANLIB=$ranlib
 MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
-#ASM=$bin_dir$asm
+$asm_def
 
 # FIPS validated module and support file locations