diff options
author | 2006-06-27 05:06:51 +0000 | |
---|---|---|
committer | 2006-06-27 05:06:51 +0000 | |
commit | 6d388760ec629bdebe2f200913a35899243a7957 (patch) | |
tree | ecc7cf9ca37d08421471848c6f746702ed91b8e8 /lib/libcrypto/rc2/rc2speed.c | |
parent | import of openssl-0.9.7j (diff) | |
download | wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.tar.xz wireguard-openbsd-6d388760ec629bdebe2f200913a35899243a7957.zip |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/rc2/rc2speed.c')
-rw-r--r-- | lib/libcrypto/rc2/rc2speed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcrypto/rc2/rc2speed.c b/lib/libcrypto/rc2/rc2speed.c index 47d34b444e5..4d0e1242eaf 100644 --- a/lib/libcrypto/rc2/rc2speed.c +++ b/lib/libcrypto/rc2/rc2speed.c @@ -102,10 +102,10 @@ OPENSSL_DECLARE_EXIT #ifndef HZ #ifndef CLK_TCK #define HZ 100.0 -#endif -#else /* CLK_TCK */ +#else /* CLK_TCK */ #define HZ ((double)CLK_TCK) -#endif +#endif /* CLK_TCK */ +#endif /* HZ */ #define BUFSIZE ((long)1024) long run=0; |