Merge from 0.9.7-stable.

[openssl.git] / crypto / cryptlib.h

diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 985a6d377c13b0101e6f64102fe9a4b958e8ebf7..0d6b9d59f0b1896a31cb1276496db8122aa348af 100644 (file)
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -89,13 +89,9 @@ extern "C" {
 #define X509_CERT_DIR_EVP        "SSL_CERT_DIR"
 #define X509_CERT_FILE_EVP       "SSL_CERT_FILE"
 
-/* size of string represenations */
-#define DECIMAL_SIZE(type)     ((sizeof(type)*8+2)/3+1)
-#define HEX_SIZE(type)         ((sizeof(type)*2)
-
-/* die if we have to */
-void OpenSSLDie(const char *file,int line,const char *assertion);
-#define die(e) ((e) ? (void)0 : OpenSSLDie(__FILE__, __LINE__, #e))
+/* size of string representations */
+#define DECIMAL_SIZE(type)     ((sizeof(type)*8+2)/3+1)
+#define HEX_SIZE(type)         (sizeof(type)*2)
 
 #ifdef  __cplusplus
 }