Merge pull request #258 from pbor/fixup

Remove leftover FIXME comment

Merge pull request #258 from pbor/fixup
Remove leftover FIXME comment
39967de7 · Robert Edmonds · GitHub · 56f47099 · 7c114269 · 39967de7
Commit 39967de7 authored Feb 27, 2017 by Robert Edmonds Committed by GitHub Feb 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

protobuf-c/protobuf-c.c protobuf-c/protobuf-c.c +1 -1

No files found.
--- a/protobuf-c/protobuf-c.c
+++ b/protobuf-c/protobuf-c.c
@@ -2165,7 +2165,7 @@ merge_messages(ProtobufCMessage *earlier_msg,
 				*p_earlier = 0;
 			}
 		} else if (fields[i].label == PROTOBUF_C_LABEL_OPTIONAL ||
-			   fields[i].label == PROTOBUF_C_LABEL_NONE) { // FIXME to check
+			   fields[i].label == PROTOBUF_C_LABEL_NONE) {
 			const ProtobufCFieldDescriptor *field;
 			uint32_t *earlier_case_p = STRUCT_MEMBER_PTR(uint32_t,
 								     earlier_msg,