diff options
| author | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2001-07-19 20:05:28 +0000 |
| commit | 18cbcd5effa4ebab72f9f535e44a5fbef433d087 (patch) | |
| tree | b2d3a3c4344c814837ab109307bb7509bb253496 /crypto/openssl/apps/speed.c | |
| parent | 84fabcda925860c067e7f03b07d3a988add59e0b (diff) | |
| download | FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.zip FreeBSD-src-18cbcd5effa4ebab72f9f535e44a5fbef433d087.tar.gz | |
Resolve conflicts
Diffstat (limited to 'crypto/openssl/apps/speed.c')
| -rw-r--r-- | crypto/openssl/apps/speed.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 <openssl/rand.h> #include <openssl/err.h> -#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 |
