Commit 6457615a authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix explicit de-init macros 



The no-op de-init macros may fail because of extraneous ";", so we use
a slightly different construct instead.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 20c56358

include/openssl/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ int BIO_socket_ioctl(int fd, long type, void *arg); 
int BIO_socket_nbio(int fd, int mode);

int BIO_sock_init(void);

#if OPENSSL_API_COMPAT < 0x10100000L

# define BIO_sock_cleanup()

# define BIO_sock_cleanup() while(0) continue

#endif

int BIO_set_tcp_ndelay(int sock, int turn_on);

include/openssl/comp.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, 
COMP_METHOD *COMP_zlib(void);



#if OPENSSL_API_COMPAT < 0x10100000L

#define COMP_zlib_cleanup()

#define COMP_zlib_cleanup() while(0) continue

#endif



# ifdef HEADER_BIO_H

include/openssl/conf.h

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ int CONF_modules_load_file(const char *filename, const char *appname, 
void CONF_modules_unload(int all);

void CONF_modules_finish(void);

#if OPENSSL_API_COMPAT < 0x10100000L

# define CONF_modules_free()

# define CONF_modules_free() while(0) continue

#endif

int CONF_module_add(const char *name, conf_init_func *ifunc,

                    conf_finish_func *ffunc);

include/openssl/crypto.h

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx); 
 * This function cleans up all "ex_data" state. It mustn't be called under

 * potential race-conditions.

 */

# define CRYPTO_cleanup_all_ex_data()

# define CRYPTO_cleanup_all_ex_data() while(0) continue



/*

 * The old locking functions have been removed completely without compatibility

include/openssl/engine.h

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ void *ENGINE_get_ex_data(const ENGINE *e, int idx); 
 * This function previously cleaned up anything that needs it. Auto-deinit will

 * now take care of it so it is no longer required to call this function.

 */

# define ENGINE_cleanup()

# define ENGINE_cleanup() while(0) continue

#endif



/*