From 18cbcd5effa4ebab72f9f535e44a5fbef433d087 Mon Sep 17 00:00:00 2001 From: kris Date: Thu, 19 Jul 2001 20:05:28 +0000 Subject: Resolve conflicts --- crypto/openssl/apps/speed.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crypto/openssl/apps/speed.c') diff --git a/crypto/openssl/apps/speed.c b/crypto/openssl/apps/speed.c index 4a42aeb..554169c 100644 --- a/crypto/openssl/apps/speed.c +++ b/crypto/openssl/apps/speed.c @@ -84,12 +84,12 @@ #include #include -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # define USE_TOD #elif !defined(MSDOS) && (!defined(VMS) || defined(__DECC)) # define TIMES #endif -#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) +#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(MPE) && !defined(__NetBSD__) # define TIMEB #endif -- cgit v1.1