X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fcrypto.h;h=d2b5ffe3325bcfc7a6b3b82fd81d807ab19490c5;hp=a1bd005c3a3a9b05f5b9e40c63635690d2875037;hb=67ffa18cceb3fafcf1a19d8e607fc9c1e8213e9d;hpb=2b247cf81fbc320a313f952e2ea39cf63aa21010 diff --git a/crypto/crypto.h b/crypto/crypto.h index a1bd005c3a..d2b5ffe332 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -517,7 +517,10 @@ 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())) /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes @@ -541,9 +544,6 @@ void ERR_load_CRYPTO_strings(void); /* Reason codes. */ #define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK 100 -unsigned long *OPENSSL_ia32cap_loc(void); -#define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc())) - #ifdef __cplusplus } #endif