Merge pull request libgit2#4043 from fudanchii/fudanchii/openbsd

Edward Thomson · web-flow · commit 42ad85ef01e3 · 2016-12-30T16:35:24.000Z
Fix BIO_* functions method linking when compiled with libressl (OpenBSD).
diff --git a/src/openssl_stream.h b/src/openssl_stream.h
@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream **out, const char *host, const char
 
 
 
-# if OPENSSL_VERSION_NUMBER < 0x10100000L
+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 
 GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
 {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ extern int git_openssl_stream_new(git_stream *out, const char host, const char`
`27`	`27`
`28`	`28`
`29`	`29`
`30`		`-# if OPENSSL_VERSION_NUMBER < 0x10100000L`
	`30`	`+# if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER)`
`31`	`31`
`32`	`32`	`GIT_INLINE(BIO_METHOD) BIO_meth_new(int type, const char name)`
`33`	`33`	`{`