From ea0d37a104d7fb412081c4c1a5cef4e69c75de22 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 21 Apr 2010 05:09:05 +0200 Subject: [PATCH] Incorporate a commit from portableproplib's git master to fix two warnings: commit 72e03f757660ed295f81315d871e51abe22df9dd Author: Juan RP Date: Wed Apr 21 05:07:53 2010 +0200 Add a cast that fixes a warning in the new zlib code. --HG-- extra : convert_revision : xtraeme%40gmail.com-20100421030905-ixl5tj2to573xnxz --- lib/portableproplib/prop_array.c | 2 +- lib/portableproplib/prop_dictionary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/portableproplib/prop_array.c b/lib/portableproplib/prop_array.c index 15437fbd..9a66acd4 100644 --- a/lib/portableproplib/prop_array.c +++ b/lib/portableproplib/prop_array.c @@ -993,7 +993,7 @@ prop_array_internalize_from_zfile(const char *fname) } strm.avail_in = mf->poimf_mapsize; - strm.next_in = mf->poimf_xml; + strm.next_in = (unsigned char *)mf->poimf_xml; /* Output buffer (decompressed) */ uncomp_xml = _PROP_MALLOC(_READ_CHUNK, M_TEMP); diff --git a/lib/portableproplib/prop_dictionary.c b/lib/portableproplib/prop_dictionary.c index 9a33c3e4..4dddbc38 100644 --- a/lib/portableproplib/prop_dictionary.c +++ b/lib/portableproplib/prop_dictionary.c @@ -1491,7 +1491,7 @@ prop_dictionary_internalize_from_zfile(const char *fname) return NULL; } strm.avail_in = mf->poimf_mapsize; - strm.next_in = mf->poimf_xml; + strm.next_in = (unsigned char *)mf->poimf_xml; /* Output buffer (uncompressed) */ uncomp_xml = _PROP_MALLOC(_READ_CHUNK, M_TEMP);