Commit effaf4de authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Use NON_EMPTY_TRANSLATION_UNIT, consistently. 



This also closes RT 4123

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 1ffa8a96

apps/dhparam.c

+5 −9
Original line number Diff line number Diff line
@@ -108,8 +108,11 @@ 
 *

 */



#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */

#ifndef OPENSSL_NO_DH

#include <openssl/opensslconf.h>

#ifdef OPENSSL_NO_DH

NON_EMPTY_TRANSLATION_UNIT

#else



# include <stdio.h>

# include <stdlib.h>

# include <time.h>
@@ -443,11 +446,4 @@ static int dh_cb(int p, int n, BN_GENCB *cb) 
    (void)BIO_flush(BN_GENCB_get_arg(cb));

    return 1;

}



#else                           /* !OPENSSL_NO_DH */



# if PEDANTIC

static void *dummy = &dummy;

# endif



#endif

apps/dsa.c

+5 −8
Original line number Diff line number Diff line
@@ -55,8 +55,11 @@ 
 * [including the GNU Public Licence.]

 */



#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */

#ifndef OPENSSL_NO_DSA

#include <openssl/opensslconf.h>

#ifdef OPENSSL_NO_DSA

NON_EMPTY_TRANSLATION_UNIT

#else



# include <stdio.h>

# include <stdlib.h>

# include <string.h>
@@ -299,10 +302,4 @@ int dsa_main(int argc, char **argv) 
    OPENSSL_free(passout);

    return (ret);

}

#else                           /* !OPENSSL_NO_DSA */



# if PEDANTIC

static void *dummy = &dummy;

# endif



#endif

apps/dsaparam.c

+4 −8
Original line number Diff line number Diff line
@@ -55,9 +55,11 @@ 
 * [including the GNU Public Licence.]

 */



#include <openssl/opensslconf.h> /* for OPENSSL_NO_DSA */

#include <openssl/opensslconf.h>

#ifdef OPENSSL_NO_DSA

NON_EMPTY_TRANSLATION_UNIT

#else



#ifndef OPENSSL_NO_DSA

# include <stdio.h>

# include <stdlib.h>

# include <time.h>
@@ -347,10 +349,4 @@ static int dsa_cb(int p, int n, BN_GENCB *cb) 
# endif

    return 1;

}

#else                           /* !OPENSSL_NO_DSA */



# if PEDANTIC

static void *dummy = &dummy;

# endif



#endif

apps/ec.c

+4 −7
Original line number Diff line number Diff line
@@ -56,7 +56,10 @@ 
 */



#include <openssl/opensslconf.h>

#ifndef OPENSSL_NO_EC

#ifdef OPENSSL_NO_EC

NON_EMPTY_TRANSLATION_UNIT

#else



# include <stdio.h>

# include <stdlib.h>

# include <string.h>
@@ -307,10 +310,4 @@ int ec_main(int argc, char **argv) 
    OPENSSL_free(passout);

    return (ret);

}

#else                           /* !OPENSSL_NO_EC */



# if PEDANTIC

static void *dummy = &dummy;

# endif



#endif

apps/ecparam.c

+4 −7
Original line number Diff line number Diff line
@@ -69,7 +69,10 @@ 
 */



#include <openssl/opensslconf.h>

#ifndef OPENSSL_NO_EC

#ifdef OPENSSL_NO_EC

NON_EMPTY_TRANSLATION_UNIT

#else



# include <stdio.h>

# include <stdlib.h>

# include <time.h>
@@ -502,10 +505,4 @@ int ecparam_main(int argc, char **argv) 
    return (ret);

}



#else                           /* !OPENSSL_NO_EC */



# if PEDANTIC

static void *dummy = &dummy;

# endif



#endif