Merge from HEAD.

diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h
index 3778f93c1522adf157e6cd0f6c3757e8f1a0c423..04c78a1ce9ce85927ec717a8a6a8d941bafe568c 100644 (file)
--- 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,