diff options
| author | assar <assar@FreeBSD.org> | 2001-06-21 02:21:57 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-06-21 02:21:57 +0000 |
| commit | c05dadd8324d3befaaa8bf5972a638fab840e9b4 (patch) | |
| tree | e6871833948536990e13646ceb0b0e09e8827e19 /crypto/heimdal/appl | |
| parent | 7281f9682138be213c08fe4674685b925aef5ead (diff) | |
| download | FreeBSD-src-c05dadd8324d3befaaa8bf5972a638fab840e9b4.zip FreeBSD-src-c05dadd8324d3befaaa8bf5972a638fab840e9b4.tar.gz | |
fix merges from 0.3f
Diffstat (limited to 'crypto/heimdal/appl')
| -rw-r--r-- | crypto/heimdal/appl/ftp/ftp/ftp_locl.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h index c0d6cae..63dc1dd 100644 --- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h +++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: ftp_locl.h,v 1.34 1999/12/02 16:58:29 joda Exp $ */ +/* $Id: ftp_locl.h,v 1.35 2001/02/15 04:20:51 assar Exp $ */ /* $FreeBSD$ */ #ifndef __FTP_LOCL_H__ @@ -130,7 +130,13 @@ struct hostent *gethostbyname(const char *); #include "roken.h" #include "security.h" -#include <openssl/des.h> /* for des_read_pw_string */ + +/* des_read_pw_string */ +#ifdef HAVE_OPENSSL_DES_H +#include <openssl/des.h> +#else +#include <des.h> +#endif #if defined(__sun__) && !defined(__svr4) int fclose(FILE*); |
