As we now remove it permanently, we no longer need NO_WINDOWS_BRAINDEATH

as a build time option...
ok deraadt@ miod@

diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile
index 26fe163..f07176f 100644 (file)
--- a/lib/libcrypto/crypto/Makefile
+++ b/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2014/04/15 16:52:50 miod Exp $
+# $OpenBSD: Makefile,v 1.7 2014/04/15 17:20:09 beck Exp $
 
 LIB=   crypto
 
@@ -24,7 +24,7 @@ CFLAGS+= -DDSO_DLFCN -DHAVE_DLFCN_H
 PICFLAG=-fPIC
 .endif
 
-CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR -DNO_WINDOWS_BRAINDEATH
+CFLAGS+= -DTERMIOS -DANSI_SOURCE -DNO_ERR
 # Hardware engines
 CFLAGS+= -DOPENSSL_NO_HW_4758_CCA
 CFLAGS+= -DOPENSSL_NO_HW_AEP

diff --git a/lib/libcrypto/cversion.c b/lib/libcrypto/cversion.c
index 4bbe74b..74317e2 100644 (file)
--- a/lib/libcrypto/cversion.c
+++ b/lib/libcrypto/cversion.c
@@ -58,10 +58,6 @@
 
 #include "cryptlib.h"
 
-#ifndef NO_WINDOWS_BRAINDEATH
-#include "buildinf.h"
-#endif
-
 const char
 *SSLeay_version(int t)
 {

diff --git a/lib/libssl/src/crypto/cversion.c b/lib/libssl/src/crypto/cversion.c
index 4bbe74b..74317e2 100644 (file)
--- a/lib/libssl/src/crypto/cversion.c
+++ b/lib/libssl/src/crypto/cversion.c
@@ -58,10 +58,6 @@
 
 #include "cryptlib.h"
 
-#ifndef NO_WINDOWS_BRAINDEATH
-#include "buildinf.h"
-#endif
-
 const char
 *SSLeay_version(int t)
 {