From 87402d4ce31321a4d0345e566adc6b6e4f77645f Mon Sep 17 00:00:00 2001 From: Cristian Stoica Date: Fri, 12 Aug 2016 17:53:25 +0300 Subject: [PATCH] merge two mutual exclusive #ifdefs to improve clarity CLA: trivial Signed-off-by: Cristian Stoica Reviewed-by: Rich Salz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/1449) --- engines/ccgost/gost_eng.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c index 5924791b77..ea52c4dbe9 100644 --- a/engines/ccgost/gost_eng.c +++ b/engines/ccgost/gost_eng.c @@ -157,10 +157,6 @@ static int bind_gost(ENGINE *e, const char *id) return ret; } -#ifndef OPENSSL_NO_DYNAMIC_ENGINE -IMPLEMENT_DYNAMIC_BIND_FN(bind_gost) - IMPLEMENT_DYNAMIC_CHECK_FN() -#endif /* ndef OPENSSL_NO_DYNAMIC_ENGINE */ static int gost_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) { @@ -278,4 +274,7 @@ void ENGINE_load_gost(void) ENGINE_free(toadd); ERR_clear_error(); } +#else +IMPLEMENT_DYNAMIC_BIND_FN(bind_gost) +IMPLEMENT_DYNAMIC_CHECK_FN() #endif -- 2.25.1