From: Andy Polyakov <appro@openssl.org>
Date: Sun, 8 May 2005 19:54:33 +0000 (+0000)
Subject: Eliminate "statement with no effect" warning when OPENSSL_assert macro
X-Git-Tag: OpenSSL_0_9_8-beta1~13^2~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b6223d2f701655d9f98fa1cdcf992967c89b443b;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 9582c9af8c..d2b5ffe332 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -517,7 +517,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))
 
 unsigned long *OPENSSL_ia32cap_loc(void);
 #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))