commit b22796788b72b1daca42bf5773b582d26860ef0a
author Haibo Huang <hhb@google.com> Fri May 31 16:12:39 2019 -0700
committer Haibo Huang <hhb@google.com> Tue Jun 18 14:58:09 2019 -0700
tree 1d148d55162d1d29b1bc55ea05ff62c1793086d6
parent eb295e03887a843c88bcef99c80c16dd8c13099a

Upgrade libevent to release-2.1.10-stable

Test: None
Change-Id: I24e4275a07a6dcdd932056c7893a6aabdd786b8a

openssl-compat.h

diff --git a/openssl-compat.h b/openssl-compat.h
index 69afc71..5d91ac6 100644
--- a/openssl-compat.h
+++ b/openssl-compat.h
@@ -1,7 +1,11 @@
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#include <openssl/bio.h>
+#include "util-internal.h"
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 
 static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
 {
@@ -30,6 +34,11 @@
 
 #define TLS_method SSLv23_method
 
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */
+
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+#define BIO_get_init(b) (b)->init
+#endif
 
 #endif /* OPENSSL_COMPAT_H */