summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStan Hu <stanhu@aclimalabs.com>2012-08-16 11:29:08 -0700
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-08-16 22:06:19 +0300
commit07f24f9b7022086187f60f52e786d0dbdbd3b7f1 (patch)
tree576967e90ba9201b389b934f57be6fc5334dbddf
parent8d5086f052f4282f22d350ac44f6699f3bdf7a06 (diff)
Fix casting issues
-rw-r--r--pb_decode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pb_decode.c b/pb_decode.c
index 5ef40ecc..48068325 100644
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -121,7 +121,7 @@ bool checkreturn pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type,
{
uint32_t temp;
*eof = false;
- *wire_type = 0;
+ *wire_type = (pb_wire_type_t) 0;
*tag = 0;
if (!pb_decode_varint32(stream, &temp))
@@ -393,7 +393,7 @@ static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_str
}
else if (PB_LTYPE(iter.current->type) == PB_LTYPE_SUBMESSAGE)
{
- pb_message_set_to_defaults(iter.current->ptr, iter.pData);
+ pb_message_set_to_defaults((const pb_field_t *) iter.current->ptr, iter.pData);
}
else if (iter.current->ptr != NULL)
{