From: Richard Levitte <levitte@openssl.org>
Date: Thu, 13 Jun 2002 23:37:26 +0000 (+0000)
Subject: Merge from HEAD.
X-Git-Tag: OpenSSL_0_9_7-beta2~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d7227da9a8b299892002f72c40e9be90d73716ca;p=oweals%2Fopenssl.git

Merge from HEAD.
---

diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h
index 3778f93c15..04c78a1ce9 100644
--- a/crypto/des/des_old.h
+++ b/crypto/des/des_old.h
@@ -366,7 +366,7 @@ int _ossl_old_des_enc_write(int fd,char *buf,int len,_ossl_old_des_key_schedule
 	_ossl_old_des_cblock *iv);
 char *_ossl_old_des_fcrypt(const char *buf,const char *salt, char *ret);
 char *_ossl_old_des_crypt(const char *buf,const char *salt);
-#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT)
+#if !defined(PERL5) && !defined(NeXT)
 char *_ossl_old_crypt(const char *buf,const char *salt);
 #endif
 void _ossl_old_des_ofb_encrypt(unsigned char *in,unsigned char *out,