diff options
author | Matt Caswell <matt@openssl.org> | 2017-08-02 14:46:31 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-08-03 10:48:00 +0100 |
commit | 67dc995eaf538ea309c6292a1a5073465201f55b (patch) | |
tree | bd562ac36e1c5796eca7693ef180b9c9636256cc /e_os.h | |
parent | 5bd05e579994c756cd994b5e0ff5f395aae6bfff (diff) |
Move ossl_assert
Move the definition of ossl_assert() out of e_os.h which is intended for OS
specific things. Instead it is moved into internal/cryptlib.h.
This also changes the definition to remove the (int) cast.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4073)
Diffstat (limited to 'e_os.h')
-rw-r--r-- | e_os.h | 17 |
1 files changed, 0 insertions, 17 deletions
@@ -545,23 +545,6 @@ struct servent *getservbyname(const char *name, const char *proto); # define CRYPTO_memcmp memcmp #endif -#ifdef NDEBUG -# define ossl_assert(x) (int)(x) -#else -__owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr, - const char *file, int line) -{ - if (!expr) - OPENSSL_die(exprstr, file, line); - - return expr; -} - -# define ossl_assert(x) ossl_assert_int((int)(x), "Assertion failed: "#x, \ - __FILE__, __LINE__) - -#endif - #ifdef __cplusplus } #endif |