Fix the macro expansion problem in the hook declaration.

Submitted by:	Ian Holsman <ianh@cnet.com>

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

diff --git a/docs/doxygen.conf b/docs/doxygen.conf
index f2051c573c9dc9c00a68dd7b95d027de6471ef2e..487eb6df2a9636c32ef0023a85c35d4a1dedc09c 100644 (file)
--- a/docs/doxygen.conf
+++ b/docs/doxygen.conf
@@ -1,18 +1,26 @@
 PROJECT_NAME=Apache
 
+#INPUT=srclib/apr
 INPUT=.
 RECURSIVE=YES
 FILE_PATTERNS=*.h
 
 OUTPUT_DIRECTORY=docs/dox
 
+ENABLE_PREPROCESSING=YES
 MACRO_EXPANSION=YES
+QUIET=YES
 EXPAND_ONLY_PREDEF=YES
-EXPAND_AS_DEFINED=
+#EXPAND_AS_DEFINED=
 # not sure why this doesn't work as EXPAND_AS_DEFINED, it should!
-PREDEFINED=APR_DECLARE(x)=x APR_DECLARE_NONSTD(x)=x \
-       AP_DECLARE_HOOK(ret,name,args)="ret name args" AP_DECLARE(x)=x \
-       AP_DECLARE_NONSTD(x)=x DOXYGEN APU_DECLARE_DATA APU_DECLARE(x)=x
+PREDEFINED="APR_DECLARE(x)=x" \
+       "APR_DECLARE_NONSTD(x)=x" \
+       "AP_DECLARE_HOOK(ret,name,args)=ret name args;" \
+       "AP_DECLARE(x)=x" \
+       "AP_DECLARE_NONSTD(x)=x" \
+       DOXYGEN= \
+       APU_DECLARE_DATA= \
+       "APU_DECLARE(x)=x"
 
 OPTIMIZE_OUTPUT_FOR_C=YES
 

diff --git a/include/http_request.h b/include/http_request.h
index cee11b4cf32997229ea5b79fd944307b9aa3d32e..21693bdf4bf63bea46458c5ce2d29187271ec394 100644 (file)
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -270,10 +270,6 @@ AP_DECLARE(void) ap_die(int type, request_rec *r);
 
 /* Hooks */
 
-/* ###: doxygen grouping doesn't appear to work, but it should. Checking with
- * doxygen (Ben).
- */
-
 /**
  * Gives modules a chance to create their request_config entry when the
  * request is created.