diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2018-03-06 17:31:39 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-06 17:31:39 -0800 |
commit | a66159a384dba6273ebdfd04ce6623d4b7e0a75e (patch) | |
tree | be9f5460fa96e5e8690f5230a779d64c74e6abd8 /upb/msg.h | |
parent | bcb62b7fbfb0c959f7d3671b40c1b7efbb3a4156 (diff) | |
parent | cafebf6beede670a10535809667ac9b9f3033091 (diff) |
Merge pull request #96 from TeBoring/php-change
For encoding upb needs descriptor type instead of type.
Diffstat (limited to 'upb/msg.h')
-rw-r--r-- | upb/msg.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -396,7 +396,7 @@ typedef struct { uint16_t hasbit; /* UPB_NO_HASBIT if no hasbit. */ uint16_t oneof_index; /* UPB_NOT_IN_ONEOF if not in a oneof. */ uint16_t submsg_index; /* UPB_NO_SUBMSG if no submsg. */ - uint8_t type; + uint8_t descriptortype; uint8_t label; } upb_msglayout_fieldinit_v1; |