diff options
| author | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-10-01 01:43:14 +0000 |
|---|---|---|
| committer | Angelos D. Keromytis <angelos@cvs.openbsd.org> | 1999-10-01 01:43:14 +0000 |
| commit | e05fa52773641258f4943cae918c3d8bebf9e228 (patch) | |
| tree | 3ef1de02094ffdbeb6f68ed8d815e3e8064031c5 | |
| parent | 280c471de541f3e35390edcbe54313ec0605a424 (diff) | |
Remove ifdefs.
| -rw-r--r-- | lib/libkeynote/keynote.h | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/lib/libkeynote/keynote.h b/lib/libkeynote/keynote.h index 024d51afeaf..b5226818bb0 100644 --- a/lib/libkeynote/keynote.h +++ b/lib/libkeynote/keynote.h @@ -1,4 +1,4 @@ -/* $OpenBSD: keynote.h,v 1.7 1999/10/01 01:08:30 angelos Exp $ */ +/* $OpenBSD: keynote.h,v 1.8 1999/10/01 01:43:13 angelos Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * @@ -22,13 +22,9 @@ #ifndef __KEYNOTE_H__ #define __KEYNOTE_H__ -#if HAVE_REGEX_H #include <sys/types.h> #include <regex.h> -#endif /* HAVE_REGEX_H */ -#if defined(CRYPTO) -#if HAVE_SSL_CRYPTO_H #include <ssl/crypto.h> #include <ssl/dsa.h> #include <ssl/rsa.h> @@ -38,48 +34,8 @@ #include <ssl/rand.h> #include <ssl/x509.h> #include <ssl/pem.h> -#elif HAVE_OPENSSL_CRYPTO_H -#include <openssl/crypto.h> -#include <openssl/dsa.h> -#include <openssl/rsa.h> -#include <openssl/sha.h> -#include <openssl/md5.h> -#include <openssl/err.h> -#include <openssl/rand.h> -#include <openssl/x509.h> -#include <openssl/pem.h> -#else /* HAVE_SSL_CRYPTO_H */ -#error "SSLeay or OpenSSL not detected!" -#endif /* HAVE_SSL_CRYPTO_H */ -#endif /* CRYPTO */ - -#if !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) -#define strcasecmp stricmp -#endif /* !HAVE_STRCASECMP && HAVE_STRICMP */ - -#if !defined(HAVE_STRNCASECMP) && defined(HAVE_STRNICMP) -#define strncasecmp strnicmp -#endif /* !HAVE_STRNCASECMP && HAVE_STRNICMP */ - -#if !defined(HAVE_OPEN) && defined(HAVE__OPEN) -#define open _open -#endif /* !HAVE_OPEN && HAVE__OPEN */ - -#if !defined(HAVE_READ) && defined(HAVE__READ) -#define read _read -#endif /* !HAVE_READ && HAVE__OPEN */ - -#if !defined(HAVE_CLOSE) && defined(HAVE__CLOSE) -#define close _close -#endif /* !HAVE_CLOSE && HAVE__CLOSE */ - -#if defined(CRYPTO) -#if HAVE__DEV_URANDOM + #define KEYNOTERNDFILENAME "/dev/urandom" -#else /* HAVE__DEV_URANDOM */ -#error "You need a random device!" -#endif /* HAVE__DEV_URANDOM */ -#endif /* CRYPTO */ struct environment { |