diff options
| author | djm <> | 2006-06-27 05:07:03 +0000 |
|---|---|---|
| committer | djm <> | 2006-06-27 05:07:03 +0000 |
| commit | 7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d (patch) | |
| tree | 224c33f66b0b932c84dda315d9ba4236bf125b1c /src/lib/libcrypto/rc2/rc2speed.c | |
| parent | 3f764f48d2626a43b6eeef7652c28303269d1204 (diff) | |
| download | openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.gz openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.tar.bz2 openbsd-7fe7e1ed6bcd0e342aed7c0f890962dda616aa0d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/rc2/rc2speed.c')
| -rw-r--r-- | src/lib/libcrypto/rc2/rc2speed.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/rc2/rc2speed.c b/src/lib/libcrypto/rc2/rc2speed.c index 47d34b444e..4d0e1242ea 100644 --- a/src/lib/libcrypto/rc2/rc2speed.c +++ b/src/lib/libcrypto/rc2/rc2speed.c | |||
| @@ -102,10 +102,10 @@ OPENSSL_DECLARE_EXIT | |||
| 102 | #ifndef HZ | 102 | #ifndef HZ |
| 103 | #ifndef CLK_TCK | 103 | #ifndef CLK_TCK |
| 104 | #define HZ 100.0 | 104 | #define HZ 100.0 |
| 105 | #endif | 105 | #else /* CLK_TCK */ |
| 106 | #else /* CLK_TCK */ | ||
| 107 | #define HZ ((double)CLK_TCK) | 106 | #define HZ ((double)CLK_TCK) |
| 108 | #endif | 107 | #endif /* CLK_TCK */ |
| 108 | #endif /* HZ */ | ||
| 109 | 109 | ||
| 110 | #define BUFSIZE ((long)1024) | 110 | #define BUFSIZE ((long)1024) |
| 111 | long run=0; | 111 | long run=0; |