From 11bb39ecf6e58a5e44fc8043004b3f455f30b8fe Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 7 Nov 2018 20:00:29 -0600 Subject: Rediffed patches for merge fuzz --- patches/bio.h.patch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'patches/bio.h.patch') diff --git a/patches/bio.h.patch b/patches/bio.h.patch index 9bfd43a..e726e20 100644 --- a/patches/bio.h.patch +++ b/patches/bio.h.patch @@ -1,12 +1,12 @@ ---- include/openssl/bio.h.orig Mon Oct 3 06:09:28 2016 -+++ include/openssl/bio.h Sun Nov 6 04:24:57 2016 -@@ -713,8 +713,24 @@ +--- include/openssl/bio.h.orig 2018-07-24 21:59:17.000000000 -0500 ++++ include/openssl/bio.h 2018-11-07 18:44:43.000000000 -0600 +@@ -713,6 +713,22 @@ /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ +#ifdef __MINGW_PRINTF_FORMAT - int - BIO_printf(BIO *bio, const char *format, ...) ++int ++BIO_printf(BIO *bio, const char *format, ...) + __attribute__((__format__(__MINGW_PRINTF_FORMAT, 2, 3), __nonnull__(2))); +int +BIO_vprintf(BIO *bio, const char *format, va_list args) @@ -20,11 +20,9 @@ + __attribute__((__deprecated__, __format__(__MINGW_PRINTF_FORMAT, 3, 0), + __nonnull__(3))); +#else -+int -+BIO_printf(BIO *bio, const char *format, ...) - __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); int - BIO_vprintf(BIO *bio, const char *format, va_list args) + BIO_printf(BIO *bio, const char *format, ...) + __attribute__((__format__(__printf__, 2, 3), __nonnull__(2))); @@ -727,6 +743,8 @@ BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) __attribute__((__deprecated__, __format__(__printf__, 3, 0), -- cgit v1.2.3-55-g6feb