diff options
author | Rich Salz <rsalz@akamai.com> | 2016-01-31 13:08:23 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-02-09 20:13:29 -0500 |
commit | effaf4dee90beff07bb40f21d81352304a5e8152 (patch) | |
tree | 4bc77d1b1998e6fac62b3a5967a223376cb47111 /crypto/asn1 | |
parent | 1ffa8a9685e22a5a0ff1b1322df4d1720b05ce4c (diff) |
Use NON_EMPTY_TRANSLATION_UNIT, consistently.
This also closes RT 4123
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1')
-rw-r--r-- | crypto/asn1/n_pkey.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 90ea32c527..c7382bd944 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -55,9 +55,13 @@ * [including the GNU Public Licence.] */ -#include <stdio.h> -#include "internal/cryptlib.h" -#ifndef OPENSSL_NO_RSA +#include "openssl/opensslconf.h" +#ifdef OPENSSL_NO_RSA +NON_EMPTY_TRANSLATION_UNIT +#else + +# include "internal/cryptlib.h" +# include <stdio.h> # include <openssl/rsa.h> # include <openssl/objects.h> # include <openssl/asn1t.h> @@ -103,10 +107,4 @@ IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_PKEY) # endif /* OPENSSL_NO_RC4 */ -#else /* !OPENSSL_NO_RSA */ - -# if PEDANTIC -static void *dummy = &dummy; -# endif - #endif |