From: Richard Levitte <levitte@openssl.org>
Date: Wed, 19 Oct 2016 17:49:43 +0000 (+0200)
Subject: apps: remove some #ifndef clutter
X-Git-Tag: OpenSSL_1_1_0c~74
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ec7b16ddbb020b2f49ff7394901cd2b2bed5234b;p=oweals%2Fopenssl.git

apps: remove some #ifndef clutter

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1643)
(cherry picked from commit b85bf6395251dc28457b95de586a2f0a5faae4af)
---

diff --git a/apps/speed.c b/apps/speed.c
index 8437ab2025..cdd0da1100 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1224,9 +1224,7 @@ int speed_main(int argc, char **argv)
     int async_init = 0;
     int loopargs_len = 0;
     char *prog;
-#ifndef OPENSSL_NO_ENGINE
     const char *engine_id = NULL;
-#endif
     const EVP_CIPHER *evp_cipher = NULL;
     double d = 0.0;
     OPTION_CHOICE o;
@@ -1400,9 +1398,7 @@ int speed_main(int argc, char **argv)
              * initialised by each child process, not by the parent.
              * So store the name here and run setup_engine() later on.
              */
-#ifndef OPENSSL_NO_ENGINE
             engine_id = opt_arg();
-#endif
             break;
         case OPT_MULTI:
 #ifndef NO_FORK