AP_DECLARRE removals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4-http2-alpha@1712740 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http2/h2_bucket_eos.c b/modules/http2/h2_bucket_eos.c
index 73ef58b5fcdd7656ee45adcbdf803ed90e674cdb..029cd1034e34de04f53782fe89c69c9331a8a20f 100644 (file)
--- a/modules/http2/h2_bucket_eos.c
+++ b/modules/http2/h2_bucket_eos.c
@@ -96,7 +96,7 @@ static void bucket_destroy(void *data)
     }
 }
 
-AP_DECLARE_DATA const apr_bucket_type_t h2_bucket_type_eos = {
+const apr_bucket_type_t h2_bucket_type_eos = {
     "H2EOS", 5, APR_BUCKET_METADATA,
     bucket_destroy,
     bucket_read,

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index 2713aeb2dabe16e5ceb3bad6fc08679bc9963a9f..e83ed4ee6691e1eb9ed9d6e5cfaec82214a0ed4b 100644 (file)
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -719,11 +719,11 @@ void h2_util_bb_log(conn_rec *c, int stream_id, int level,
 
 }
 
-AP_DECLARE(apr_status_t) h2_transfer_brigade(apr_bucket_brigade *to,
-                                             apr_bucket_brigade *from, 
-                                             apr_pool_t *p,
-                                             apr_size_t *plen,
-                                             int *peos)
+apr_status_t h2_transfer_brigade(apr_bucket_brigade *to,
+                                 apr_bucket_brigade *from, 
+                                 apr_pool_t *p,
+                                 apr_size_t *plen,
+                                 int *peos)
 {
     apr_bucket *e;
     apr_size_t len = 0, remain = *plen;

diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h
index a488e2a041eeabeb317c91a579446c0baeb62be1..0612af6ba328aec18d7b808efcee15cf0316f2ef 100644 (file)
--- a/modules/http2/h2_util.h
+++ b/modules/http2/h2_util.h
@@ -154,10 +154,10 @@ void h2_util_bb_log(conn_rec *c, int stream_id, int level,
  * @param plen maximum bytes to transfer, actual bytes transferred
  * @param peos if an EOS bucket was transferred
  */
-AP_DECLARE(apr_status_t) h2_transfer_brigade(apr_bucket_brigade *to,
-                                             apr_bucket_brigade *from, 
-                                             apr_pool_t *p,
-                                             apr_size_t *plen,
-                                             int *peos);
+apr_status_t h2_transfer_brigade(apr_bucket_brigade *to,
+                                 apr_bucket_brigade *from, 
+                                 apr_pool_t *p,
+                                 apr_size_t *plen,
+                                 int *peos);
 
 #endif /* defined(__mod_h2__h2_util__) */