diff options
| author |  Richard Fussenegger <Fleshgrinder@users.noreply.github.com> | 2017-07-17 18:13:12 +0200 |
|---|---|---|
| committer |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-07-17 09:13:12 -0700 |
| commit | 29ff49f5345693bd04aa37654aa002054d1b9780 (patch) | |
| tree | 76fa5669dd64b601855ebdc22d3907e3a0a6ee91 /php | |
| parent | c78dbd7c895b8c80cd2f2401d73acf890edf82c6 (diff) | |
Fix Implicit Return Types (#3363)
Both native_slot_merge and native_slot_merge_by_array have no return
type declared. GCC implicitly uses int as return type in such cases,
however, these functions are actually void.
Diffstat (limited to 'php')
| -rw-r--r-- | php/ext/google/protobuf/storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/php/ext/google/protobuf/storage.c b/php/ext/google/protobuf/storage.c index c0e4da3e..6c789bcb 100644 --- a/php/ext/google/protobuf/storage.c +++ b/php/ext/google/protobuf/storage.c @@ -762,7 +762,7 @@ void layout_set(MessageLayout* layout, MessageHeader* header, } } -static native_slot_merge(const upb_fielddef* field, const void* from_memory, +static void native_slot_merge(const upb_fielddef* field, const void* from_memory, void* to_memory PHP_PROTO_TSRMLS_DC) { upb_fieldtype_t type = upb_fielddef_type(field); zend_class_entry* ce = NULL; @@ -819,7 +819,7 @@ static native_slot_merge(const upb_fielddef* field, const void* from_memory, } } -static native_slot_merge_by_array(const upb_fielddef* field, const void* from_memory, +static void native_slot_merge_by_array(const upb_fielddef* field, const void* from_memory, void* to_memory PHP_PROTO_TSRMLS_DC) { upb_fieldtype_t type = upb_fielddef_type(field); switch (type) { |