import openssl-0.9.7-beta1

1 files changed, 4 insertions, 5 deletions

diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h
index 93bd9c34c8..ab48b78ae9 100644
--- a/src/lib/libcrypto/comp/comp.h
+++ b/src/lib/libcrypto/comp/comp.h
@@ -2,12 +2,12 @@
 #ifndef HEADER_COMP_H
 #define HEADER_COMP_H
 
+#include <openssl/crypto.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <openssl/crypto.h>
-
 typedef struct comp_method_st
         {
         int type;               /* NID for compression library */
@@ -17,6 +17,7 @@ typedef struct comp_method_st
         int (*compress)();
         int (*expand)();
         long (*ctrl)();
+        long (*callback_ctrl)();
         } COMP_METHOD;
 
 typedef struct comp_ctx_st
@@ -38,14 +39,13 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
         unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
-#ifdef ZLIB
 COMP_METHOD *COMP_zlib(void );
-#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_COMP_strings(void);
 
 /* Error codes for the COMP functions. */
 
@@ -57,4 +57,3 @@ COMP_METHOD *COMP_zlib(void );
 }
 #endif
 #endif
-