The big change. This is part 3 of the apr-util symbols rename, please

  see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


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

8 files changed, 37 insertions, 41 deletions

diff --git a/include/ap_config.h b/include/ap_config.h
index 9601ec7d8f..3c876e9204 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -57,7 +57,7 @@
 
 #include "ap_mmn.h"		/* MODULE_MAGIC_NUMBER_ */
 #include "apr_lib.h"		/* apr_isfoo() macros */
-#include "ap_hooks.h"
+#include "apr_hooks.h"
 
 /**
  * AP_DECLARE_EXPORT is defined when building the Apache Core dynamic
@@ -133,15 +133,11 @@
 #define AP_MODULE_DECLARE_DATA __declspec(dllexport)
 #endif
 
-/* XXX: Must go away, perhaps into compat, maybe not even there.
- */
-#define MODULE_VAR_EXPORT    AP_MODULE_DECLARE_DATA
-
 #define AP_DECLARE_HOOK(ret,name,args) \
-AP_DECLARE_EXTERNAL_HOOK(AP,ret,name,args)
+APR_DECLARE_EXTERNAL_HOOK(ap,AP,ret,name,args)
 
 #define AP_IMPLEMENT_HOOK_BASE(name) \
-AP_IMPLEMENT_EXTERNAL_HOOK_BASE(AP,name)
+APR_IMPLEMENT_EXTERNAL_HOOK_BASE(ap,AP,name)
 
 /**
  * Implement an Apache core hook that has no return code, and therefore 
@@ -151,10 +147,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_BASE(AP,name)
  * @param args_used The names for the arguments for the hook
  * @deffunc void AP_IMPLEMENT_HOOK_VOID(name, args_decl, args_use)
  * @tip If IMPLEMENTing a hook that is not linked into the Apache core,
- * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_HOOK_VOID.
+ * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_HOOK_VOID.
  */
 #define AP_IMPLEMENT_HOOK_VOID(name,args_decl,args_use) \
-AP_IMPLEMENT_EXTERNAL_HOOK_VOID(AP,name,args_decl,args_use)
+APR_IMPLEMENT_EXTERNAL_HOOK_VOID(ap,AP,name,args_decl,args_use)
 
 /**
  * Implement an Apache core hook that runs until one of the functions 
@@ -164,10 +160,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_VOID(AP,name,args_decl,args_use)
  * @param args_used The names for the arguments for the hook
  * @deffunc int AP_IMPLEMENT_HOOK_RUN_ALL(name, args_decl, args_use)
  * @tip If IMPLEMENTing a hook that is not linked into the Apache core,
- * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.
+ * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL.
  */
 #define AP_IMPLEMENT_HOOK_RUN_ALL(ret,name,args_decl,args_use,ok,decline) \
-AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(AP,ret,name,args_decl,args_use,ok,decline)
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(ap,AP,ret,name,args_decl,args_use,ok,decline)
 
 /**
  * Implement a hook that runs until the first function returns something
@@ -177,10 +173,10 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_ALL(AP,ret,name,args_decl,args_use,ok,decline)
  * @param args_used The names for the arguments for the hook
  * @deffunc int AP_IMPLEMENT_HOOK_RUN_FIRST(name, args_decl, args_use)
  * @tip If IMPLEMENTing a hook that is not linked into the Apache core
- * (e.g. within a dso) see AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.
+ * (e.g. within a dso) see APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST.
  */
 #define AP_IMPLEMENT_HOOK_RUN_FIRST(ret,name,args_decl,args_use,decline) \
-AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline)
+APR_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(ap,AP,ret,name,args_decl,args_use,decline)
 
 #ifdef WIN32
 #include "os.h"
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 355fc957d5..32b8d4798b 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -221,11 +221,11 @@
  * 19990320.3           - add ap_regexec() and ap_regerror()
  * 19990320.4           - add ap_field_noparam()
  * 19990320.5           - add local_ip/host to conn_rec for mass-vhost
- * 19990320.6           - add ap_SHA1Final(), ap_SHA1Init(),
- *                        ap_SHA1Update_binary(), ap_SHA1Update(),
- *                        ap_base64encode(), ap_base64encode_binary(),
- *                        ap_base64encode_len(), ap_base64decode(),
- *                        ap_base64decode_binary(), ap_base64decode_len(),
+ * 19990320.6           - add apr_SHA1Final(), apr_SHA1Init(),
+ *                        apr_SHA1Update_binary(), apr_SHA1Update(),
+ *                        apr_base64encode(), apr_base64encode_binary(),
+ *                        apr_base64encode_len(), apr_base64decode(),
+ *                        apr_base64decode_binary(), apr_base64decode_len(),
  *                        ap_pbase64decode(), ap_pbase64encode()
  */
 
diff --git a/include/http_config.h b/include/http_config.h
index f16cb3c5da..dac23df52a 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -59,7 +59,7 @@
 #ifndef APACHE_HTTP_CONFIG_H
 #define APACHE_HTTP_CONFIG_H
 
-#include "ap_hooks.h"
+#include "apr_hooks.h"
 #include "util_cfgtree.h"
 
 #ifdef __cplusplus
diff --git a/include/http_connection.h b/include/http_connection.h
index f7a880336b..8f0d2264fd 100644
--- a/include/http_connection.h
+++ b/include/http_connection.h
@@ -55,7 +55,7 @@
 #ifndef APACHE_HTTP_CONNECTION_H
 #define APACHE_HTTP_CONNECTION_H
 
-#include "ap_hooks.h"
+#include "apr_hooks.h"
 #include "apr_network_io.h"
 
 #ifdef __cplusplus
diff --git a/include/http_core.h b/include/http_core.h
index 18463449cf..d1ea4af248 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -333,7 +333,7 @@ extern AP_DECLARE_DATA module core_module;
 typedef struct {
     /* bucket brigade used by getline for look-ahead and 
      * ap_get_client_block for holding left-over request body */
-    struct ap_bucket_brigade *bb;
+    struct apr_bucket_brigade *bb;
 } core_request_config;
 
 /* Per-directory configuration */
diff --git a/include/http_protocol.h b/include/http_protocol.h
index b7a33d97c0..225f870c84 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -59,11 +59,11 @@
 #ifndef APACHE_HTTP_PROTOCOL_H
 #define APACHE_HTTP_PROTOCOL_H
 
-#include "ap_hooks.h"
+#include "apr_hooks.h"
 #include "apr_portable.h"
 #include "apr_mmap.h"
 #include "util_filter.h"
-#include "ap_buckets.h"
+#include "apr_buckets.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -103,10 +103,10 @@ AP_DECLARE(void) ap_basic_http_header(request_rec *r, char *buf);
  */
 AP_DECLARE(void) ap_send_http_header(request_rec *l);
 
-AP_CORE_DECLARE_NONSTD(apr_status_t) ap_byterange_filter(ap_filter_t *f, ap_bucket_brigade *b);
-AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, ap_bucket_brigade *b);
+AP_CORE_DECLARE_NONSTD(apr_status_t) ap_byterange_filter(ap_filter_t *f, apr_bucket_brigade *b);
+AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, apr_bucket_brigade *b);
 AP_CORE_DECLARE_NONSTD(apr_status_t) ap_content_length_filter(ap_filter_t *, 
-                                                              ap_bucket_brigade *);
+                                                              apr_bucket_brigade *);
 
 /* Send the response to special method requests */
 
@@ -516,8 +516,8 @@ AP_DECLARE(int) ap_method_number_of(const char *method);
  */
 AP_DECLARE(const char *) ap_method_name_of(int methnum);
 
-apr_status_t ap_http_filter(ap_filter_t *f, ap_bucket_brigade *b, ap_input_mode_t mode);
-apr_status_t ap_dechunk_filter(ap_filter_t *f, ap_bucket_brigade *b, ap_input_mode_t mode);
+apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
+apr_status_t ap_dechunk_filter(ap_filter_t *f, apr_bucket_brigade *b, ap_input_mode_t mode);
 
 
   /* Hooks */
diff --git a/include/http_request.h b/include/http_request.h
index fb81011718..0dbf428625 100644
--- a/include/http_request.h
+++ b/include/http_request.h
@@ -59,7 +59,7 @@
 #ifndef APACHE_HTTP_REQUEST_H
 #define APACHE_HTTP_REQUEST_H
 
-#include "ap_hooks.h"
+#include "apr_hooks.h"
 #include "util_filter.h"
 
 #ifdef __cplusplus
@@ -137,10 +137,10 @@ AP_DECLARE(request_rec *) ap_sub_req_method_uri(const char *method,
  * has to be inserted at the end of a sub-requests filter stack.
  * @param f The current filter
  * @param bb The brigade to filter
- * @deffuc apr_status_t ap_sub_req_output_filter(ap_filter_t *f, ap_bucket_brigade *bb)
+ * @deffuc apr_status_t ap_sub_req_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
  */
 AP_CORE_DECLARE_NONSTD(apr_status_t) ap_sub_req_output_filter(ap_filter_t *f,
-                                                        ap_bucket_brigade *bb);
+                                                        apr_bucket_brigade *bb);
 
 /**
  * Run the handler for the sub request
diff --git a/include/util_filter.h b/include/util_filter.h
index cfd82ce50b..1777b1e35d 100644
--- a/include/util_filter.h
+++ b/include/util_filter.h
@@ -65,7 +65,7 @@ extern "C" {
 
 #include "httpd.h"
 #include "apr.h"
-#include "ap_buckets.h"
+#include "apr_buckets.h"
 
 /**
  * @package Apache filter library
@@ -150,8 +150,8 @@ typedef struct ap_filter_t ap_filter_t;
  *
  * The return value of a filter should be an APR status value.
  */
-typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f, ap_bucket_brigade *b);
-typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f, ap_bucket_brigade *b, 
+typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f, apr_bucket_brigade *b);
+typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f, apr_bucket_brigade *b, 
                                           ap_input_mode_t mode);
 typedef union ap_filter_func {
     ap_out_filter_func out_func;
@@ -280,9 +280,9 @@ struct ap_filter_t {
  * @param bucket The current bucket brigade
  * @param mode   AP_MODE_BLOCKING, AP_MODE_NONBLOCKING, or AP_MODE_PEEK
  * @return apr_status_t value
- * @deffunc apr_status_t ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket, ap_input_mode_t mode)
+ * @deffunc apr_status_t ap_get_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket, ap_input_mode_t mode)
  */
-AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket, 
+AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket, 
                                         ap_input_mode_t mode);
 
 /**
@@ -292,9 +292,9 @@ AP_DECLARE(apr_status_t) ap_get_brigade(ap_filter_t *filter, ap_bucket_brigade *
  * @param filter The next filter in the chain
  * @param bucket The current bucket brigade
  * @return apr_status_t value
- * @deffunc apr_status_t ap_pass_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket)
+ * @deffunc apr_status_t ap_pass_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket)
  */
-AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *filter, ap_bucket_brigade *bucket);
+AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket);
 
 /*
  * ap_register_input_filter():
@@ -399,10 +399,10 @@ AP_DECLARE(void) ap_remove_output_filter(ap_filter_t *f);
  *             new bucket brigade is returned in this location.
  * @param b The bucket brigade to save aside.  This brigade is always empty
  *          on return
- * @deffunc apr_status_t ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **save_to, ap_bucket_brigade **b)
+ * @deffunc apr_status_t ap_save_brigade(ap_filter_t *f, apr_bucket_brigade **save_to, apr_bucket_brigade **b)
  */
-AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f, ap_bucket_brigade **save_to,
-                                         ap_bucket_brigade **b);    
+AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f, apr_bucket_brigade **save_to,
+                                         apr_bucket_brigade **b);    
 
 #ifdef __cplusplus
 }