Module: libav Branch: master Commit: f22363c72968f1a1fc4881d8695ec7068b0aa03c
Author: Martin Storsjö <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Tue Oct 25 21:33:34 2016 +0300 openssl: Avoid double semicolons after the GET_BIO_DATA macro When the macro is expanded with a semicolon following it and the macro itself contains a semicolon, we ended up in double semicolons, which is treated as a statement that disallows further declarations. This avoids errors about mixed declarations and statements on gcc, after ee050797664c. Signed-off-by: Martin Storsjö <[email protected]> --- libavformat/tls_openssl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 4d94774..aab885c 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -152,9 +152,9 @@ static int url_bio_destroy(BIO *b) } #if OPENSSL_VERSION_NUMBER >= 0x1010000fL -#define GET_BIO_DATA(x) BIO_get_data(x); +#define GET_BIO_DATA(x) BIO_get_data(x) #else -#define GET_BIO_DATA(x) (x)->ptr; +#define GET_BIO_DATA(x) (x)->ptr #endif static int url_bio_bread(BIO *b, char *buf, int len) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
