Add ASN1_DISABLE_DEPRECATED.

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index a607cb0..c6f8fc1 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -25,7 +25,7 @@ SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
+SCAN_OPTIONS=--deprecated-guards=ASN1_DISABLE_DEPRECATED
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml

diff --git a/lib/errors.c b/lib/errors.c
index f4ed364..cbfb622 100644 (file)
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -97,6 +97,8 @@ asn1_strerror (asn1_retCode error)
   return NULL;
 }
 
+#ifndef ASN1_DISABLE_DEPRECATED
+
 /* Compatibility mappings to preserve ABI. */
 
 /**
@@ -131,3 +133,5 @@ libtasn1_strerror (asn1_retCode error)
 {
   return asn1_strerror (error);
 }
+
+#endif

diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index bc1a465..94ba802 100644 (file)
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -234,6 +234,8 @@ extern "C"
 
   /* Deprecated stuff. */
 
+#ifndef ASN1_DISABLE_DEPRECATED
+
 #define LIBTASN1_VERSION ASN1_VERSION
 
 #ifndef MAX_NAME_SIZE
@@ -257,6 +259,8 @@ extern "C"
   /* Use asn1_perror instead. */
   void libtasn1_perror (asn1_retCode error) ASN1_DEPRECATED;
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif