Fixes for Win32 build.

[openssl.git] / crypto / asn1 / a_dup.c

diff --git a/crypto/asn1/a_dup.c b/crypto/asn1/a_dup.c
index 51ed105ff20c41f6959d376ba8921b2995f05b0f..c3bda58a5d9ec849fcc1cf7cd3df5ebc079a890b 100644 (file)
--- a/crypto/asn1/a_dup.c
+++ b/crypto/asn1/a_dup.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/a_dup.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -58,14 +58,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1_mac.h>
 
 #define READ_CHUNK   2048
 
-char *ASN1_dup(i2d,d2i,x)
-int (*i2d)();
-char *(*d2i)();
-char *x;
+char *ASN1_dup(int (*i2d)(), char *(*d2i)(), char *x)
        {
        unsigned char *b,*p;
        long i;
@@ -74,13 +71,13 @@ char *x;
        if (x == NULL) return(NULL);
 
        i=(long)i2d(x,NULL);
-       b=(unsigned char *)Malloc((unsigned int)i+10);
+       b=(unsigned char *)OPENSSL_malloc((unsigned int)i+10);
        if (b == NULL)
                { ASN1err(ASN1_F_ASN1_DUP,ERR_R_MALLOC_FAILURE); return(NULL); }
        p= b;
        i=i2d(x,&p);
        p= b;
        ret=d2i(NULL,&p,i);
-       Free((char *)b);
+       OPENSSL_free(b);
        return(ret);
        }