Windows build fixes.

openssl · Jul 1, 2014 · 70857a4 · 70857a4
1 parent 2580ab4
commit 70857a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -617,6 +617,8 @@
 	$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 @@
 MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
-#ASM=$bin_dir$asm
+$asm_def
 
 # FIPS validated module and support file locations