From: Andy Polyakov <appro@openssl.org>
Date: Sun, 8 May 2005 19:52:13 +0000 (+0000)
Subject: Eliminate "statement with no effect" warning when OPENSSL_assert macro
X-Git-Tag: BEN_FIPS_TEST_8~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b1ca6f2f3d0781ee11a632a8e1d09b208f1e0229;p=oweals%2Fopenssl.git

Eliminate "statement with no effect" warning when OPENSSL_assert macro
is used with constant assertion.
---

diff --git a/crypto/crypto.h b/crypto/crypto.h
index c77566aa0e..22fd939e65 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -434,7 +434,7 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
 
 /* die if we have to */
 void OpenSSLDie(const char *file,int line,const char *assertion);
-#define OPENSSL_assert(e)	((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e))
+#define OPENSSL_assert(e)	(void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
 
 #ifdef OPENSSL_FIPS
 #define FIPS_ERROR_IGNORED(alg) OpenSSLDie(__FILE__, __LINE__, \