Merge pull request #96 from TeBoring/php-change

For encoding upb needs descriptor type instead of type.

1 files changed, 1 insertions, 1 deletions

diff --git a/upb/msg.h b/upb/msg.h
index 3579a3f..e875f6e 100644
--- a/upb/msg.h
+++ b/upb/msg.h
@@ -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;