From: Tim Hudson <tjh@openssl.org>
Date: Mon, 17 Aug 2015 12:16:39 +0000 (+1000)
Subject: restore usage of -elapsed that was disabled in the ifdef reorg
X-Git-Tag: OpenSSL_1_1_0-pre1~797
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=686e344918229cae90562384c01606ba88ed51ba;p=oweals%2Fopenssl.git

restore usage of -elapsed that was disabled in the ifdef reorg

Reviewed-by: Ben Laurie <ben@openssl.org>
---

diff --git a/apps/speed.c b/apps/speed.c
index ca93d2c070..49efa7b4c9 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -364,10 +364,8 @@ OPTIONS speed_options[] = {
     {"mr", OPT_MR, '-', "Produce machine readable output"},
     {"mb", OPT_MB, '-'},
     {"misalign", OPT_MISALIGN, 'n', "Amount to mis-align buffers"},
-#if defined(TIMES) || defined(USE_TOD)
     {"elapsed", OPT_ELAPSED, '-',
      "Measure time in real time instead of CPU user time"},
-#endif
 #ifndef NO_FORK
     {"multi", OPT_MULTI, 'p', "Run benchmarks in parallel"},
 #endif
@@ -755,9 +753,6 @@ int speed_main(int argc, char **argv)
     long ecdh_c[EC_NUM][2];
     int ecdh_doit[EC_NUM];
 #endif
-#ifndef TIMES
-    usertime = -1;
-#endif
 
     memset(results, 0, sizeof(results));
 #ifndef OPENSSL_NO_DSA