diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-13 20:20:43 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-08 20:46:17 +0100 |
| commit | 040d43b3ff8daca32dd0f72155f668249506b51b (patch) | |
| tree | c074fb38ae2fa87825901dd703a1d6d6cdddb69a /include | |
| parent | Remove the -n tar flag from osx dist creation (diff) | |
| download | openssl-040d43b3ff8daca32dd0f72155f668249506b51b.tar.xz openssl-040d43b3ff8daca32dd0f72155f668249506b51b.zip | |
OpenSSLDie --> OPENSSL_die
Also removed a bunch of unused define's from e_os.h
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 41eac25a09..2969e2e61d 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -482,8 +482,12 @@ int CRYPTO_mem_leaks(struct bio_st *bio); # endif /* die if we have to */ -void OpenSSLDie(const char *file, int line, const char *assertion); -# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1)) +# if OPENSSL_API_COMPAT < 0x10100000L +# define OpenSSLDie(f,l,a) OPENSSL_die((a),(f),(l)) +# endif +void OPENSSL_die(const char *assertion, const char *file, int line); +# define OPENSSL_assert(e) \ + (void)((e) ? 0 : (OPENSSL_die("assertion failed: " #e, OPENSSL_FILE, OPENSSL_LINE), 1)) unsigned int *OPENSSL_ia32cap_loc(void); # define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0]) |