Merge r1818278 from trunk:

APR-ize uint types

Submitted by: jim
Reviewed by: covener, jim, ylavic

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

diff --git a/modules/filters/mod_brotli.c b/modules/filters/mod_brotli.c
index b2ab8c6bd06881191cff0a84b392940ecde25fa0..dd91f6e703c479580c984c31069699be54020c41 100644 (file)
--- a/modules/filters/mod_brotli.c
+++ b/modules/filters/mod_brotli.c
@@ -212,11 +212,11 @@ static apr_status_t process_chunk(brotli_ctx_t *ctx,
                                   apr_size_t len,
                                   ap_filter_t *f)
 {
-    const uint8_t *next_in = data;
+    const apr_byte_t *next_in = data;
     apr_size_t avail_in = len;
 
     while (avail_in > 0) {
-        uint8_t *next_out = NULL;
+        apr_byte_t *next_out = NULL;
         apr_size_t avail_out = 0;
 
         if (!BrotliEncoderCompressStream(ctx->state,
@@ -230,7 +230,7 @@ static apr_status_t process_chunk(brotli_ctx_t *ctx,
 
         if (BrotliEncoderHasMoreOutput(ctx->state)) {
             apr_size_t output_len = 0;
-            const uint8_t *output;
+            const apr_byte_t *output;
             apr_status_t rv;
             apr_bucket *b;
 
@@ -265,12 +265,12 @@ static apr_status_t flush(brotli_ctx_t *ctx,
                           ap_filter_t *f)
 {
     while (1) {
-        const uint8_t *next_in = NULL;
+        const apr_byte_t *next_in = NULL;
         apr_size_t avail_in = 0;
-        uint8_t *next_out = NULL;
+        apr_byte_t *next_out = NULL;
         apr_size_t avail_out = 0;
         apr_size_t output_len;
-        const uint8_t *output;
+        const apr_byte_t *output;
         apr_bucket *b;
 
         if (!BrotliEncoderCompressStream(ctx->state, op,