*Merge.

--HG--
branch : trunk

1 files changed, 25 insertions, 25 deletions

diff --git a/dep/include/openssl/comp.h b/dep/include/openssl/comp.h
index 5d59354a571..c94262fc051 100644
--- a/dep/include/openssl/comp.h
+++ b/dep/include/openssl/comp.h
@@ -11,40 +11,40 @@ extern "C" {
 typedef struct comp_ctx_st COMP_CTX;
 
 typedef 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);
-	void (*finish)(COMP_CTX *ctx);
-	int (*compress)(COMP_CTX *ctx,
-			unsigned char *out, unsigned int olen,
-			unsigned char *in, unsigned int ilen);
-	int (*expand)(COMP_CTX *ctx,
-		      unsigned char *out, unsigned int olen,
-		      unsigned char *in, unsigned int ilen);
-	/* The following two do NOTHING, but are kept for backward compatibility */
-	long (*ctrl)(void);
-	long (*callback_ctrl)(void);
-	} COMP_METHOD;
+    {
+    int type;       /* NID for compression library */
+    const char *name;   /* A text string to identify the library */
+    int (*init)(COMP_CTX *ctx);
+    void (*finish)(COMP_CTX *ctx);
+    int (*compress)(COMP_CTX *ctx,
+            unsigned char *out, unsigned int olen,
+            unsigned char *in, unsigned int ilen);
+    int (*expand)(COMP_CTX *ctx,
+              unsigned char *out, unsigned int olen,
+              unsigned char *in, unsigned int ilen);
+    /* The following two do NOTHING, but are kept for backward compatibility */
+    long (*ctrl)(void);
+    long (*callback_ctrl)(void);
+    } COMP_METHOD;
 
 struct comp_ctx_st
-	{
-	COMP_METHOD *meth;
-	unsigned long compress_in;
-	unsigned long compress_out;
-	unsigned long expand_in;
-	unsigned long expand_out;
+    {
+    COMP_METHOD *meth;
+    unsigned long compress_in;
+    unsigned long compress_out;
+    unsigned long expand_in;
+    unsigned long expand_out;
 
-	CRYPTO_EX_DATA	ex_data;
-	};
+    CRYPTO_EX_DATA  ex_data;
+    };
 
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
 void COMP_CTX_free(COMP_CTX *ctx);
 int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-	unsigned char *in, int ilen);
+    unsigned char *in, int ilen);
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-	unsigned char *in, int ilen);
+    unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
 COMP_METHOD *COMP_zlib(void );