Avoid name clash.

[openssl.git] / crypto / comp / comp_lib.c

diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c
index dec3b1fc778de382958b94796156f67f04cd4bc7..b60ae371e8d133da1fb3af17df26b68dd205ccdb 100644 (file)
--- a/crypto/comp/comp_lib.c
+++ b/crypto/comp/comp_lib.c
@@ -1,14 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "objects.h"
-#include "comp.h"
+#include <openssl/objects.h>
+#include <openssl/comp.h>
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
        {
        COMP_CTX *ret;
 
-       if ((ret=(COMP_CTX *)Malloc(sizeof(COMP_CTX))) == NULL)
+       if ((ret=(COMP_CTX *)OPENSSL_malloc(sizeof(COMP_CTX))) == NULL)
                {
                /* ZZZZZZZZZZZZZZZZ */
                return(NULL);
@@ -17,27 +17,21 @@ COMP_CTX *COMP_CTX_new(COMP_METHOD *meth)
        ret->meth=meth;
        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                {
-               Free(ret);
+               OPENSSL_free(ret);
                ret=NULL;
                }
-#if 0
-       else
-               CRYPTO_new_ex_data(rsa_meth,(char *)ret,&ret->ex_data);
-#endif
        return(ret);
        }
 
 void COMP_CTX_free(COMP_CTX *ctx)
        {
-       /* CRYPTO_free_ex_data(rsa_meth,(char *)ctx,&ctx->ex_data); */
-
        if(ctx == NULL)
            return;
 
        if (ctx->meth->finish != NULL)
                ctx->meth->finish(ctx);
 
-       Free(ctx);
+       OPENSSL_free(ctx);
        }
 
 int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,