Two type mismatch fixes previously committed to trunk\

and forgotten from backports

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

diff --git a/modules/http/http_etag.c b/modules/http/http_etag.c
index 427ebc782880b5c916f9b8e62f65f0bb5de1d65d..a7d3d9c0a99f6cca7019cca23258dc16d4b50c47 100644 (file)
--- a/modules/http/http_etag.c
+++ b/modules/http/http_etag.c
@@ -37,7 +37,8 @@ static char *etag_uint64_to_hex(char *next, apr_uint64_t u)
     int printing = 0;
     int shift = sizeof(apr_uint64_t) * 8 - 4;
     do {
-        unsigned short next_digit = ((u >> shift) & (apr_uint64_t)0xf);
+        unsigned short next_digit = (unsigned short)
+                                    ((u >> shift) & (apr_uint64_t)0xf);
         if (next_digit) {
             *next++ = HEX_DIGITS[next_digit];
             printing = 1;

diff --git a/support/ab.c b/support/ab.c
index 7efff3149cd0eb91e1b14bc7fe8cd2ea0c2e1576..5adf5a5b1aac97e22c084093ec545d33f64a3bc5 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -1147,7 +1147,7 @@ static void start_connect(struct connection * c)
         SSL_set_connect_state(c->ssl);
         if (verbosity >= 4) {
             BIO_set_callback(bio, ssl_print_cb);
-            BIO_set_callback_arg(bio, bio_err);
+            BIO_set_callback_arg(bio, (void *)bio_err);
         }
     } else {
         c->ssl = NULL;