diff options
| author | djm <> | 2009-01-09 12:15:52 +0000 |
|---|---|---|
| committer | djm <> | 2009-01-09 12:15:52 +0000 |
| commit | eef32868c6aa961f0ae29b5a113d0690dc4db25e (patch) | |
| tree | a2a7787bc00e8f6a29153b8c6d9eb5e8f73d6269 /src/lib/libcrypto/engine/enginetest.c | |
| parent | ed26972d251de1f03147983371ecfba887241c5e (diff) | |
| download | openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.gz openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.tar.bz2 openbsd-eef32868c6aa961f0ae29b5a113d0690dc4db25e.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/engine/enginetest.c')
| -rw-r--r-- | src/lib/libcrypto/engine/enginetest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/engine/enginetest.c b/src/lib/libcrypto/engine/enginetest.c index cf82f490db..e3834611db 100644 --- a/src/lib/libcrypto/engine/enginetest.c +++ b/src/lib/libcrypto/engine/enginetest.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | 60 | #include <string.h> |
| 61 | #include <openssl/e_os2.h> | ||
| 61 | 62 | ||
| 62 | #ifdef OPENSSL_NO_ENGINE | 63 | #ifdef OPENSSL_NO_ENGINE |
| 63 | int main(int argc, char *argv[]) | 64 | int main(int argc, char *argv[]) |
| @@ -66,7 +67,6 @@ int main(int argc, char *argv[]) | |||
| 66 | return(0); | 67 | return(0); |
| 67 | } | 68 | } |
| 68 | #else | 69 | #else |
| 69 | #include <openssl/e_os2.h> | ||
| 70 | #include <openssl/buffer.h> | 70 | #include <openssl/buffer.h> |
| 71 | #include <openssl/crypto.h> | 71 | #include <openssl/crypto.h> |
| 72 | #include <openssl/engine.h> | 72 | #include <openssl/engine.h> |