diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/des/des_opts.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/des/des_opts.c')
| -rw-r--r-- | src/lib/libcrypto/des/des_opts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c index 79278b920e..2df82962c5 100644 --- a/src/lib/libcrypto/des/des_opts.c +++ b/src/lib/libcrypto/des/des_opts.c | |||
| @@ -71,7 +71,11 @@ | |||
| 71 | #include <io.h> | 71 | #include <io.h> |
| 72 | extern void exit(); | 72 | extern void exit(); |
| 73 | #endif | 73 | #endif |
| 74 | |||
| 75 | #ifndef OPENSSL_SYS_NETWARE | ||
| 74 | #include <signal.h> | 76 | #include <signal.h> |
| 77 | #endif | ||
| 78 | |||
| 75 | #ifndef _IRIX | 79 | #ifndef _IRIX |
| 76 | #include <time.h> | 80 | #include <time.h> |
| 77 | #endif | 81 | #endif |