From: Stefan Sperling <stsp@apache.org>
Date: Sun, 23 Dec 2018 14:26:06 +0000 (+0000)
Subject: Use apr_uint64_t instead of uint64_t; Pointed out by ylavic
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11bd32e34572e1a808639a459cec51ae25de524c;p=thirdparty%2Fapache%2Fhttpd.git

Use apr_uint64_t instead of uint64_t; Pointed out by ylavic


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

diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c
index 12199a7e9b0..3948a76254a 100644
--- a/modules/filters/mod_deflate.c
+++ b/modules/filters/mod_deflate.c
@@ -895,8 +895,8 @@ static apr_status_t deflate_out_filter(ap_filter_t *f,
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01384)
                           "Zlib: Compressed %" APR_UINT64_T_FMT
                           " to %" APR_UINT64_T_FMT " : URL %s",
-                          (uint64_t)ctx->stream.total_in,
-                          (uint64_t)ctx->stream.total_out, r->uri);
+                          (apr_uint64_t)ctx->stream.total_in,
+                          (apr_uint64_t)ctx->stream.total_out, r->uri);
 
             /* leave notes for logging */
             if (c->note_input_name) {
@@ -1442,8 +1442,8 @@ static apr_status_t deflate_in_filter(ap_filter_t *f,
                 ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01393)
                               "Zlib: Inflated %" APR_UINT64_T_FMT
                               " to %" APR_UINT64_T_FMT " : URL %s",
-                              (uint64_t)ctx->stream.total_in,
-                              (uint64_t)ctx->stream.total_out, r->uri);
+                              (apr_uint64_t)ctx->stream.total_in,
+                              (apr_uint64_t)ctx->stream.total_out, r->uri);
 
                 consume_buffer(ctx, c, c->bufferSize - ctx->stream.avail_out,
                                UPDATE_CRC, ctx->proc_bb);
@@ -1465,7 +1465,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f,
                                       "Zlib: Length %" APR_UINT64_T_FMT
                                       " of inflated data does not match"
                                       " expected value %ld",
-                                      (uint64_t)ctx->stream.total_out, compLen);
+                                      (apr_uint64_t)ctx->stream.total_out, compLen);
                         return APR_EGENERAL;
                     }
                 }
@@ -1634,8 +1634,8 @@ static apr_status_t inflate_out_filter(ap_filter_t *f,
             ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01398)
                           "Zlib: Inflated %" APR_UINT64_T_FMT 
                           " to %" APR_UINT64_T_FMT " : URL %s",
-                          (uint64_t)ctx->stream.total_in,
-                          (uint64_t)ctx->stream.total_out, r->uri);
+                          (apr_uint64_t)ctx->stream.total_in,
+                          (apr_uint64_t)ctx->stream.total_out, r->uri);
 
             if (ctx->validation_buffer_length == VALIDATION_SIZE) {
                 unsigned long compCRC, compLen;