httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1712740 - in /httpd/httpd/branches/2.4-http2-alpha/modules/http2: h2_bucket_eos.c h2_util.c h2_util.h
Date Thu, 05 Nov 2015 11:00:16 GMT
Author: icing
Date: Thu Nov  5 11:00:15 2015
New Revision: 1712740

URL: http://svn.apache.org/viewvc?rev=1712740&view=rev
Log:
AP_DECLARRE removals

Modified:
    httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_bucket_eos.c
    httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.c
    httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.h

Modified: httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_bucket_eos.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_bucket_eos.c?rev=1712740&r1=1712739&r2=1712740&view=diff
==============================================================================
--- httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_bucket_eos.c (original)
+++ httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_bucket_eos.c Thu Nov  5 11:00:15
2015
@@ -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,

Modified: httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.c?rev=1712740&r1=1712739&r2=1712740&view=diff
==============================================================================
--- httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.c (original)
+++ httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.c Thu Nov  5 11:00:15 2015
@@ -719,11 +719,11 @@ void h2_util_bb_log(conn_rec *c, int str
 
 }
 
-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;

Modified: httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.h?rev=1712740&r1=1712739&r2=1712740&view=diff
==============================================================================
--- httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.h (original)
+++ httpd/httpd/branches/2.4-http2-alpha/modules/http2/h2_util.h Thu Nov  5 11:00:15 2015
@@ -154,10 +154,10 @@ void h2_util_bb_log(conn_rec *c, int str
  * @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__) */



Mime
View raw message