diff options
-rw-r--r-- | doc/Makefile.am | 4 | ||||
-rw-r--r-- | lib/int.h | 2 | ||||
-rw-r--r-- | lib/libtasn1.h | 4 | ||||
-rw-r--r-- | lib/libtasn1.map | 4 | ||||
-rw-r--r-- | lib/parser_aux.c | 2 | ||||
-rw-r--r-- | lib/structure.c | 2 |
6 files changed, 13 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ae65f0b..608448a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -64,6 +64,8 @@ gdoc_MANS += man/asn1_expand_any_defined_by.3 gdoc_MANS += man/asn1_expand_octet_string.3 gdoc_MANS += man/asn1_perror.3 gdoc_MANS += man/asn1_strerror.3 +gdoc_MANS += man/libtasn1_perror.3 +gdoc_MANS += man/libtasn1_strerror.3 gdoc_MANS += man/asn1_find_node.3 gdoc_MANS += man/asn1_check_version.3 gdoc_MANS += man/asn1_length_der.3 @@ -104,6 +106,8 @@ gdoc_TEXINFOS += texi/asn1_expand_any_defined_by.texi gdoc_TEXINFOS += texi/asn1_expand_octet_string.texi gdoc_TEXINFOS += texi/asn1_perror.texi gdoc_TEXINFOS += texi/asn1_strerror.texi +gdoc_TEXINFOS += texi/libtasn1_perror.texi +gdoc_TEXINFOS += texi/libtasn1_strerror.texi gdoc_TEXINFOS += texi/asn1_find_node.texi gdoc_TEXINFOS += texi/asn1_check_version.texi gdoc_TEXINFOS += texi/asn1_length_der.texi @@ -44,7 +44,7 @@ /* This structure is also in libtasn1.h, but then contains less fields. You cannot make any modifications to these first fields without breaking ABI. */ -struct node_asn +struct node_asn_struct { /* public fields: */ char *name; /* Node name */ diff --git a/lib/libtasn1.h b/lib/libtasn1.h index f6236d2..fe3f150 100644 --- a/lib/libtasn1.h +++ b/lib/libtasn1.h @@ -287,11 +287,11 @@ extern "C" /* Use asn1_strerror instead. */ const char *libtasn1_strerror (asn1_retCode error) - __attribute__ ((deprecated)); + __attribute__ ((deprecated)) ASN1_API; /* Use asn1_perror instead. */ void libtasn1_perror (asn1_retCode error) - __attribute__ ((deprecated)); + __attribute__ ((deprecated)) ASN1_API; #endif diff --git a/lib/libtasn1.map b/lib/libtasn1.map index ca00716..ca662c0 100644 --- a/lib/libtasn1.map +++ b/lib/libtasn1.map @@ -50,6 +50,10 @@ LIBTASN1_0_3 asn1_strerror; asn1_write_value; + # Old symbols + libtasn1_strerror; + libtasn1_perror; + local: *; }; diff --git a/lib/parser_aux.c b/lib/parser_aux.c index 29d0a18..554551d 100644 --- a/lib/parser_aux.c +++ b/lib/parser_aux.c @@ -58,7 +58,7 @@ _asn1_add_node (unsigned int type) list_type *listElement; ASN1_TYPE punt; - punt = (ASN1_TYPE) _asn1_calloc (1, sizeof (struct node_asn)); + punt = (ASN1_TYPE) _asn1_calloc (1, sizeof (struct node_asn_struct)); if (punt == NULL) return NULL; diff --git a/lib/structure.c b/lib/structure.c index bea3077..3931651 100644 --- a/lib/structure.c +++ b/lib/structure.c @@ -50,7 +50,7 @@ _asn1_add_node_only (unsigned int type) { ASN1_TYPE punt; - punt = (ASN1_TYPE) _asn1_calloc (1, sizeof (struct node_asn)); + punt = (ASN1_TYPE) _asn1_calloc (1, sizeof (struct node_asn_struct)); if (punt == NULL) return NULL; |