commit - f96777db7d671131d0aa9d8e5445f7bdcdddce5d
commit + 325fd0ff80ebb97d410ea8e0706013064b394fd6
blob - f570c5bccfbd8bb726e3c0933616ad1775ad437d
blob + e867b2ed686a49e0a0b9d8d0e49c9b0d2faf1a98
--- content.c
+++ content.c
@@ -30,7 +30,7 @@ pp_contentop(FILE *stream, const HParsedToken *tok, in
 	 * case for HBytes instead of rolling our own.
 	 */
 	t.token_type = TT_BYTES;
-	t.bytes.token = co->opname;
+	t.bytes.token = (uint8_t *)co->opname;
 	t.bytes.len = strlen(co->opname);
 	h_pprint(stream, &t, indent, delta);
 
@@ -152,7 +152,7 @@ act_idict(const HParseResult *p, void *u)
 	const HParsedToken *seq = p->ast;
 	HParsedToken *res, *kv, *k, *v;
 	const char *s;
-	size_t i, j;
+	size_t i, j, l;
 
 	res = H_MAKE_SEQN(h_seq_len(seq));
 
@@ -176,7 +176,7 @@ act_idict(const HParseResult *p, void *u)
 			}
 			if (bytes_eq(k->bytes, kabbr[j].abbr)) {
 				/* found an abbreviation, expand it */
-				k = H_MAKE_BYTES(s, strlen(s));
+				k = H_MAKE_BYTES((uint8_t *)s, strlen(s));
 				break;
 			}
 		}
@@ -188,7 +188,8 @@ act_idict(const HParseResult *p, void *u)
 		    bytes_eq(k->bytes, "Filter")) {
 			for (j = 0; (s = vabbr[j].full) != NULL; j++) {
 				if (bytes_eq(v->bytes, vabbr[j].abbr)) {
-					v = H_MAKE_BYTES(s, strlen(s));
+					l = strlen(s);
+					v = H_MAKE_BYTES((uint8_t *)s, l);
 					break;
 				}
 			}