[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  eb334f73a8f82f6663038bcbc402468295944694 (commit)
      from  54fc5795c9f7d0dc95d537672c716c9d250eb0fb (commit)


- Log -----------------------------------------------------------------
commit eb334f73a8f82f6663038bcbc402468295944694
Author: Alessandro Ghedini <alessandro at ghedini.me>
Date:   Tue May 17 16:23:46 2016 +0100

    Avoid double declaration of COMP_METHOD
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1083)

-----------------------------------------------------------------------

Summary of changes:
 crypto/comp/comp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 60a0734..df599ba 100644
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -14,7 +14,7 @@ extern "C" {
 
 typedef struct comp_ctx_st COMP_CTX;
 
-typedef struct comp_method_st {
+struct comp_method_st {
     int type;                   /* NID for compression library */
     const char *name;           /* A text string to identify the library */
     int (*init) (COMP_CTX *ctx);
@@ -30,7 +30,7 @@ typedef struct comp_method_st {
      */
     long (*ctrl) (void);
     long (*callback_ctrl) (void);
-} COMP_METHOD;
+};
 
 struct comp_ctx_st {
     COMP_METHOD *meth;