diff options
| author | miod <> | 2014-04-13 15:25:35 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-13 15:25:35 +0000 |
| commit | 1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a (patch) | |
| tree | 74f4ff344980894c7c9ceeab9b81176ac7572566 /src/lib/libcrypto/des/des_old.h | |
| parent | 92349eb53934e1b3e9b807e603d45417a6320d21 (diff) | |
| download | openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.tar.gz openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.tar.bz2 openbsd-1fb5cf10c3e597dbb1ecc4dd423bba727fd7721a.zip | |
Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.
Diffstat (limited to 'src/lib/libcrypto/des/des_old.h')
| -rw-r--r-- | src/lib/libcrypto/des/des_old.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h index 8665ba4e7e..2b2c372354 100644 --- a/src/lib/libcrypto/des/des_old.h +++ b/src/lib/libcrypto/des/des_old.h | |||
| @@ -88,8 +88,8 @@ | |||
| 88 | * | 88 | * |
| 89 | */ | 89 | */ |
| 90 | 90 | ||
| 91 | #ifndef HEADER_DES_OLD_H | 91 | #ifndef HEADER_DES_H |
| 92 | #define HEADER_DES_OLD_H | 92 | #define HEADER_DES_H |
| 93 | 93 | ||
| 94 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */ | 94 | #include <openssl/e_os2.h> /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */ |
| 95 | 95 | ||
| @@ -97,7 +97,7 @@ | |||
| 97 | #error DES is disabled. | 97 | #error DES is disabled. |
| 98 | #endif | 98 | #endif |
| 99 | 99 | ||
| 100 | #ifndef HEADER_DES_H | 100 | #ifndef HEADER_NEW_DES_H |
| 101 | #error You must include des.h, not des_old.h directly. | 101 | #error You must include des.h, not des_old.h directly. |
| 102 | #endif | 102 | #endif |
| 103 | 103 | ||