diff options
| author | djm <> | 2005-04-29 05:39:33 +0000 |
|---|---|---|
| committer | djm <> | 2005-04-29 05:39:33 +0000 |
| commit | 68edd00d9258df93b1366c71ac124e0cadf7bc08 (patch) | |
| tree | 3ce4ae2a9747bbc11aed1f95f9bbea92c41f8683 /src/lib/libcrypto/rc4/rc4_locl.h | |
| parent | f396ed0f5ce0af56bfde2e75e15cf1f52924c779 (diff) | |
| download | openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.gz openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.tar.bz2 openbsd-68edd00d9258df93b1366c71ac124e0cadf7bc08.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rc4/rc4_locl.h')
| -rw-r--r-- | src/lib/libcrypto/rc4/rc4_locl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/libcrypto/rc4/rc4_locl.h b/src/lib/libcrypto/rc4/rc4_locl.h index 3bb80b6ce9..c712e1632e 100644 --- a/src/lib/libcrypto/rc4/rc4_locl.h +++ b/src/lib/libcrypto/rc4/rc4_locl.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef HEADER_RC4_LOCL_H | 1 | #ifndef HEADER_RC4_LOCL_H |
| 2 | #define HEADER_RC4_LOCL_H | 2 | #define HEADER_RC4_LOCL_H |
| 3 | #include <openssl/opensslconf.h> | 3 | #include <openssl/opensslconf.h> |
| 4 | #include <cryptlib.h> | ||
| 4 | #endif | 5 | #endif |