More cleanup.

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

diff --git a/include/ap_config.h b/include/ap_config.h
index e961a903e4218bdc388353e1780e4dfe0450bfe0..a30990dbb5ae343c86464726fe27b5f3fe41cfaf 100644 (file)
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -246,7 +246,7 @@
 
 /**
  * Hook an optional hook. Unlike static hooks, this uses a macro instead of a
- * function
+ * function.
  */
 #define AP_OPTIONAL_HOOK(name,fn,pre,succ,order) \
         APR_OPTIONAL_HOOK(ap,name,fn,pre,succ,order)

diff --git a/modules/experimental/mod_optional_hook_export.c b/modules/experimental/mod_optional_hook_export.c
index 9717a02fd1f352549a1159fd8c759ca9b76854f3..e4e3c6493dd9b2edda0891a9f5f5ddce6a7cd1c4 100644 (file)
--- a/modules/experimental/mod_optional_hook_export.c
+++ b/modules/experimental/mod_optional_hook_export.c
@@ -57,9 +57,6 @@
 #include "mod_optional_hook_export.h"
 #include "http_protocol.h"
 
-/*APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,optional_hook_test,
-                                   (const char *szStr),
-                                   (szStr),OK,DECLINED)*/
 AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,optional_hook_test,(const char *szStr),
                                    (szStr),OK,DECLINED)
 

diff --git a/modules/experimental/mod_optional_hook_export.h b/modules/experimental/mod_optional_hook_export.h
index 4e7f3f389134f15abe0dc57fcf048f099bd5aa81..e96418738b80aa5b32965235d23b12c2c4a7fd6d 100644 (file)
--- a/modules/experimental/mod_optional_hook_export.h
+++ b/modules/experimental/mod_optional_hook_export.h
@@ -55,7 +55,7 @@
 #ifndef MOD_OPTIONAL_HOOK_EXPORT_H
 #define MOD_OPTOPNAL_HOOK_EXPORT_H
 
-#include "apr_optional_hooks.h"
+#include "ap_config.h"
 
 AP_DECLARE_HOOK(int,optional_hook_test,(const char *))
 

diff --git a/modules/test/mod_optional_hook_export.c b/modules/test/mod_optional_hook_export.c
index 9717a02fd1f352549a1159fd8c759ca9b76854f3..e4e3c6493dd9b2edda0891a9f5f5ddce6a7cd1c4 100644 (file)
--- a/modules/test/mod_optional_hook_export.c
+++ b/modules/test/mod_optional_hook_export.c
@@ -57,9 +57,6 @@
 #include "mod_optional_hook_export.h"
 #include "http_protocol.h"
 
-/*APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap,AP_MODULE,int,optional_hook_test,
-                                   (const char *szStr),
-                                   (szStr),OK,DECLINED)*/
 AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,optional_hook_test,(const char *szStr),
                                    (szStr),OK,DECLINED)
 

diff --git a/modules/test/mod_optional_hook_export.h b/modules/test/mod_optional_hook_export.h
index 4e7f3f389134f15abe0dc57fcf048f099bd5aa81..e96418738b80aa5b32965235d23b12c2c4a7fd6d 100644 (file)
--- a/modules/test/mod_optional_hook_export.h
+++ b/modules/test/mod_optional_hook_export.h
@@ -55,7 +55,7 @@
 #ifndef MOD_OPTIONAL_HOOK_EXPORT_H
 #define MOD_OPTOPNAL_HOOK_EXPORT_H
 
-#include "apr_optional_hooks.h"
+#include "ap_config.h"
 
 AP_DECLARE_HOOK(int,optional_hook_test,(const char *))