From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 17 Jul 2014 21:31:53 +0000 (+0000)
Subject: Fix all errors related to apreq in doxygen processing.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94c255cd5a2c32b01ca61c9be66680b1487cc9c8;p=thirdparty%2Fapache%2Fhttpd.git

Fix all errors related to apreq in doxygen processing.
Remove useless comment. As far as I have tested (with dox 1.8.6), it works as described in doxygen doc.

Generated docs are still only visible from the "List File". More work is needed to have them included within the "Module/Core routine" architecture. However they are now useable and the ouput of "make dox" is now readable :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1611480 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/doxygen.conf b/docs/doxygen.conf
index 5213edd130b..9b20a98302b 100644
--- a/docs/doxygen.conf
+++ b/docs/doxygen.conf
@@ -21,8 +21,10 @@ ENABLE_PREPROCESSING=YES
 MACRO_EXPANSION=YES
 QUIET=YES
 EXPAND_ONLY_PREDEF=YES
-#EXPAND_AS_DEFINED=
-# not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
+EXPAND_AS_DEFINED=APREQ_PARSER_ARGS \
+    APREQ_HOOK_ARGS \
+    APREQ_DECLARE_PARSER \
+    APREQ_DECLARE_HOOK
 PREDEFINED="APR_DECLARE(x)=x" \
        "APR_DECLARE_NONSTD(x)=x" \
        "AP_DECLARE_HOOK(ret,name,args)=ret name args;" \
@@ -30,7 +32,7 @@ PREDEFINED="APR_DECLARE(x)=x" \
        "APR_DECLARE_EXTERNAL_HOOK(ns,link,ret,name,args)= ret ns##_hook_##name args;" \
        "AP_DECLARE(x)=x" \
        "AP_DECLARE_NONSTD(x)=x" \
-       AP_CORE_DECLARE(x)=x \
+       "AP_CORE_DECLARE(x)=x" \
        "AP_CORE_DECLARE_NONSTD(x)=x" \       
        "APR_HAS_THREADS" \
        "APR_HAS_MMAP" \
@@ -59,7 +61,9 @@ PREDEFINED="APR_DECLARE(x)=x" \
 	__pre_nw__= \
 	"APU_DECLARE(x)=x" \
 	"CACHE_DECLARE(x)=x" \
-	"PROXY_DECLARE(x)=x"
+	"PROXY_DECLARE(x)=x" \
+    "APREQ_DECLARE(x)=x" \
+    "APREQ_DECLARE_NONSTD(x)=x"
 	
 
 OPTIMIZE_OUTPUT_FOR_C=YES