From 67dc995eaf538ea309c6292a1a5073465201f55b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 2 Aug 2017 14:46:31 +0100 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/4073) --- e_os.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'e_os.h') diff --git a/e_os.h b/e_os.h index 7138c7a181..d4cef609bb 100644 --- a/e_os.h +++ b/e_os.h @@ -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 -- cgit v1.2.3