From ff48c0d9098080b51ea12710029135916d117806 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 30 Mar 2010 12:36:28 +0000 Subject: svn merge -r514:HEAD ^/branches/released . --- openssl/crypto/asn1/a_dup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openssl/crypto/asn1/a_dup.c') diff --git a/openssl/crypto/asn1/a_dup.c b/openssl/crypto/asn1/a_dup.c index 199d50f52..d98992548 100644 --- a/openssl/crypto/asn1/a_dup.c +++ b/openssl/crypto/asn1/a_dup.c @@ -62,7 +62,7 @@ #ifndef NO_OLD_ASN1 -void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, char *x) +void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x) { unsigned char *b,*p; const unsigned char *p2; -- cgit v1.2.3