diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
| commit | 96de7a4399a8c71cbb70d6252fa77acfd76b3f09 (patch) | |
| tree | e6f6e4aad1952944ccd27e9eb47ea48b9a78dde7 /lib/libcrypto/rc2/rc2speed.c | |
| parent | ec7710fe8f10fb624fbc33c0bbad2474e0c26979 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/rc2/rc2speed.c')
| -rw-r--r-- | lib/libcrypto/rc2/rc2speed.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libcrypto/rc2/rc2speed.c b/lib/libcrypto/rc2/rc2speed.c index 4d0e1242eaf..85cf6f65bf1 100644 --- a/lib/libcrypto/rc2/rc2speed.c +++ b/lib/libcrypto/rc2/rc2speed.c @@ -69,7 +69,10 @@ #include OPENSSL_UNISTD_IO OPENSSL_DECLARE_EXIT +#ifndef OPENSSL_SYS_NETWARE #include <signal.h> +#endif + #ifndef _IRIX #include <time.h> #endif |