diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/btree_gist/btree_utils_num.c | 8 | ||||
| -rw-r--r-- | contrib/pgcrypto/imath.c | 2 | ||||
| -rw-r--r-- | contrib/pgcrypto/md5.c | 2 | ||||
| -rw-r--r-- | contrib/pgcrypto/pgp-compress.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index 4d10bc93f3e..7564a403c7d 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -185,10 +185,10 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin c.upper = &cur[tinfo->size]; /* if out->lower > cur->lower, adopt cur as lower */ if (tinfo->f_gt(o.lower, c.lower, flinfo)) - memcpy((void *) o.lower, c.lower, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, o.lower), c.lower, tinfo->size); /* if out->upper < cur->upper, adopt cur as upper */ if (tinfo->f_lt(o.upper, c.upper, flinfo)) - memcpy((void *) o.upper, c.upper, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, o.upper), c.upper, tinfo->size); } return out; @@ -237,9 +237,9 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo, FmgrInfo * ur.lower = &(((GBT_NUMKEY *) DatumGetPointer(*u))[0]); ur.upper = &(((GBT_NUMKEY *) DatumGetPointer(*u))[tinfo->size]); if (tinfo->f_gt(ur.lower, rd.lower, flinfo)) - memcpy((void *) ur.lower, rd.lower, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, ur.lower), rd.lower, tinfo->size); if (tinfo->f_lt(ur.upper, rd.upper, flinfo)) - memcpy((void *) ur.upper, rd.upper, tinfo->size); + memcpy(unconstify(GBT_NUMKEY *, ur.upper), rd.upper, tinfo->size); } } diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c index b94a51b81a4..c267ea6ab33 100644 --- a/contrib/pgcrypto/imath.c +++ b/contrib/pgcrypto/imath.c @@ -2050,7 +2050,7 @@ mp_int_read_cstring(mp_int z, mp_size radix, const char *str, char **end) MP_SIGN(z) = MP_ZPOS; if (end != NULL) - *end = (char *) str; + *end = unconstify(char *, str); /* * Return a truncation error if the string has unprocessed characters diff --git a/contrib/pgcrypto/md5.c b/contrib/pgcrypto/md5.c index cac4e408ab4..5bcfbfe28f1 100644 --- a/contrib/pgcrypto/md5.c +++ b/contrib/pgcrypto/md5.c @@ -161,7 +161,7 @@ md5_loop(md5_ctxt *ctxt, const uint8 *input, unsigned len) md5_calc(ctxt->md5_buf, ctxt); for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN) - md5_calc((uint8 *) (input + i), ctxt); + md5_calc(unconstify(uint8 *, (input + i)), ctxt); ctxt->md5_i = len - i; memmove(ctxt->md5_buf, input + i, ctxt->md5_i); diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c index 57efe733386..eaeb221877f 100644 --- a/contrib/pgcrypto/pgp-compress.c +++ b/contrib/pgcrypto/pgp-compress.c @@ -117,7 +117,7 @@ compress_process(PushFilter *next, void *priv, const uint8 *data, int len) */ while (len > 0) { - st->stream.next_in = (void *) data; + st->stream.next_in = unconstify(uint8 *, data); st->stream.avail_in = len; st->stream.next_out = st->buf; st->stream.avail_out = st->buf_len; |