From: Alessandro Ghedini <alessandro@ghedini.me>
Date: Tue, 17 May 2016 15:23:46 +0000 (+0100)
Subject: Avoid double declaration of COMP_METHOD
X-Git-Tag: OpenSSL_1_0_2i~188
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb334f73a8f82f6663038bcbc402468295944694;p=oweals%2Fopenssl.git

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

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 60a073404e..df599ba331 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;