aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-02-28 03:40:16 +0000
committerRob Austein <sra@hactrn.net>2009-02-28 03:40:16 +0000
commit35a75b207c8ad7e43b9e1c0bef2210c74c1af69f (patch)
tree7f5e989fabc268346561c53e6b1c3585088f4063
parentdc4a6c0d37c492dfe0996c226327671944bb228e (diff)
OpenSSL's ASN.1 template macros confuse the bleep out of Doxygen.
svn path=/rcynic/Doxyfile; revision=2279
-rw-r--r--rcynic/Doxyfile2
-rw-r--r--rcynic/rcynic.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/rcynic/Doxyfile b/rcynic/Doxyfile
index 7e9a609d..f918772e 100644
--- a/rcynic/Doxyfile
+++ b/rcynic/Doxyfile
@@ -1244,7 +1244,7 @@ INCLUDE_FILE_PATTERNS =
# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED =
+PREDEFINED = DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c
index 2fb62090..e537a497 100644
--- a/rcynic/rcynic.c
+++ b/rcynic/rcynic.c
@@ -402,8 +402,15 @@ static void HOST_MIB_COUNTER_free(HOST_MIB_COUNTER *h)
* for these defaulted "version" fields, but it's what the examples
* for this construction use. Probably doesn't matter since this
* program only decodes manifests, never encodes them.
+ *
+ * Putting this section under conditional compilation is a hack to
+ * keep Doxygen's parser from becoming hopelessly confused by the
+ * weird OpenSSL ASN.1 macros. Someday perhaps I'll have time to
+ * track down the problem in Doxygen's parser, but this works for now.
*/
+#ifndef DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION
+
typedef struct FileAndHash_st {
ASN1_IA5STRING *file;
ASN1_BIT_STRING *hash;
@@ -547,6 +554,8 @@ IMPLEMENT_ASN1_FUNCTIONS(ROA)
#define sk_ROAIPAddressFamily_sort(st) SKM_sk_sort(ROAIPAddressFamily, (st))
#define sk_ROAIPAddressFamily_is_sorted(st) SKM_sk_is_sorted(ROAIPAddressFamily, (st))
+#endif /* DOXYGEN_GETS_HOPELESSLY_CONFUSED_BY_THIS_SECTION */
+
/**