diff options
| author | nectar <nectar@FreeBSD.org> | 2002-09-16 21:07:11 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-09-16 21:07:11 +0000 |
| commit | ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877 (patch) | |
| tree | ca9493c028253b7988c291da5839cb536b72c540 /crypto/heimdal/appl | |
| parent | a876cfedd88823d520688032e9bde83b68098a88 (diff) | |
| download | FreeBSD-src-ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877.zip FreeBSD-src-ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/heimdal/appl')
| -rw-r--r-- | crypto/heimdal/appl/ftp/ftp/ftp_locl.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h index a729d0c..f371ca1 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.36 2001/08/22 20:30:19 assar Exp $ */ +/* $Id: ftp_locl.h,v 1.37 2002/09/10 20:03:46 joda Exp $ */ /* $FreeBSD$ */ #ifndef __FTP_LOCL_H__ @@ -132,11 +132,7 @@ struct hostent *gethostbyname(const char *); #include "security.h" /* des_read_pw_string */ -#ifdef HAVE_OPENSSL -#include <openssl/des.h> -#else -#include <des.h> -#endif +#include "crypto-headers.h" #if defined(__sun__) && !defined(__svr4) int fclose(FILE*); |
