diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-11-18 05:29:21 -0500 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-12-10 18:43:45 +0100 |
| commit | 436c21a0fd317cb929fb00eefb1ac84e90676097 (patch) | |
| tree | 01441031b55fcdeb6c258ce024362d2a17af58f7 /include | |
| parent | 8c06d7199e3885d24e39439f54b2ed2e5b40fbea (diff) | |
Remove handling of outdated macro's
DECLARE_STACK_OF was renamed to DEFINE_STACK_OF in commit 8588571.
Expanded the only use of TYPEDEF_{D2I,I2D,D2I2D}_OF, so that they can
easily be removed in a future release
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/10464)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/asn1.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 1aa4b8300c..07db817d42 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -276,7 +276,8 @@ typedef struct ASN1_VALUE_st ASN1_VALUE; # define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(const type *,unsigned char **) # define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type) -TYPEDEF_D2I2D_OF(void); +typedef void *d2i_of_void(void **, const unsigned char **, long); +typedef int i2d_of_void(const void *, unsigned char **); /*- * The following macros and typedefs allow an ASN1_ITEM |