openssl: Avoid double semicolons after the GET_BIO_DATA macro

Message ID 20161025183422.13027-1-martin@martin.st
State Committed
Commit f22363c72968f1a1fc4881d8695ec7068b0aa03c
Headers show

Commit Message

Martin Storsjö Oct. 25, 2016, 6:34 p.m.
This avoids errors about mixed declarations and statements on gcc,
after ee050797664c.
---
 libavformat/tls_openssl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Luca Barbato Oct. 25, 2016, 6:43 p.m. | #1
On 25/10/2016 20:34, Martin Storsjö wrote:
> This avoids errors about mixed declarations and statements on gcc,
> after ee050797664c.
> ---
>  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)
> 

Sure

Patch

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)