diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-31 19:08:23 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-10 02:13:29 +0100 |
| commit | effaf4dee90beff07bb40f21d81352304a5e8152 (patch) | |
| tree | 4bc77d1b1998e6fac62b3a5967a223376cb47111 /apps/engine.c | |
| parent | Make some global variables static (diff) | |
| download | openssl-effaf4dee90beff07bb40f21d81352304a5e8152.tar.xz openssl-effaf4dee90beff07bb40f21d81352304a5e8152.zip | |
Use NON_EMPTY_TRANSLATION_UNIT, consistently.
This also closes RT 4123
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/engine.c')
| -rw-r--r-- | apps/engine.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/apps/engine.c b/apps/engine.c index b10f61631d..b60bfbc294 100644 --- a/apps/engine.c +++ b/apps/engine.c @@ -56,12 +56,16 @@ * */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "apps.h" -#include <openssl/err.h> -#ifndef OPENSSL_NO_ENGINE +#include <openssl/opensslconf.h> +#ifdef OPENSSL_NO_ENGINE +NON_EMPTY_TRANSLATION_UNIT +#else + +# include "apps.h" +# include <stdio.h> +# include <stdlib.h> +# include <string.h> +# include <openssl/err.h> # include <openssl/engine.h> # include <openssl/ssl.h> @@ -483,10 +487,4 @@ int engine_main(int argc, char **argv) BIO_free_all(out); return (ret); } -#else - -# if PEDANTIC -static void *dummy = &dummy; -# endif - #endif |