diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2005-04-19 00:12:36 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2005-04-19 00:12:36 +0000 |
commit | f68854b4c344ed6ebf1893055bd63654849996e1 (patch) | |
tree | 6ff42991d0bc7b4bfbcf69cc5736c49a52650de6 /crypto/stack/safestack.h | |
parent | 1cfd258ed61721ef667ea8a6ca46b57f3765007e (diff) |
Various Win32 and other fixes for warnings and compilation errors.
Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.
Diffstat (limited to 'crypto/stack/safestack.h')
-rw-r--r-- | crypto/stack/safestack.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/stack/safestack.h b/crypto/stack/safestack.h index b50149dd96..3167e3ec6e 100644 --- a/crypto/stack/safestack.h +++ b/crypto/stack/safestack.h @@ -194,14 +194,14 @@ STACK_OF(type) \ sk_is_sorted(st) #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ - d2i_ASN1_SET(st,pp,length, (char *(*)())d2i_func, (void (*)(void *))free_func, ex_tag,ex_class) + d2i_ASN1_SET(st,pp,length, (char *(*)(void ** ,const unsigned char ** ,long))d2i_func, (void (*)(void *))free_func, ex_tag,ex_class) #define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \ i2d_ASN1_SET(st,pp,i2d_func,ex_tag,ex_class,is_set) #define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \ ASN1_seq_pack(st, i2d_func, buf, len) #define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \ - ASN1_seq_unpack(buf,len,(char *(*)(void *,unsigned char **,long))d2i_func, (void(*)(void *))free_func) + ASN1_seq_unpack(buf,len,(char *(*)(void *,const unsigned char **,long))d2i_func, (void(*)(void *))free_func) #define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \ ((STACK *)PKCS12_decrypt_d2i(algor,(char *(*)())d2i_func, (void(*)(void *))free_func,pass,passlen,oct,seq)) |