X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=pb.h;h=f68d1d65ee8d3e1b360206750e1f835f6730c1be;hb=31e09c6630c47d0aa1c1ec3909a936ba5674254f;hp=0e1e92d51cdcdbe4b9a8527a850af7ce57988f5d;hpb=060e6a6cc21eaf555cba6d3ee2558527e6790a5f;p=apps%2Fagl-service-can-low-level.git diff --git a/pb.h b/pb.h index 0e1e92d5..f68d1d65 100644 --- a/pb.h +++ b/pb.h @@ -46,7 +46,7 @@ /* Version of the nanopb library. Just in case you want to check it in * your own program. */ -#define NANOPB_VERSION nanopb-0.3.7-dev +#define NANOPB_VERSION nanopb-0.3.8-dev /* Include all the system headers needed by nanopb. You will need the * definitions of the following: @@ -393,6 +393,8 @@ struct pb_extension_s { #define PB_DATAOFFSET_FIRST(st, m1, m2) (offsetof(st, m1)) /* data_offset for subsequent fields */ #define PB_DATAOFFSET_OTHER(st, m1, m2) (offsetof(st, m1) - offsetof(st, m2) - pb_membersize(st, m2)) +/* data offset for subsequent fields inside an union (oneof) */ +#define PB_DATAOFFSET_UNION(st, m1, m2) (PB_SIZE_MAX) /* Choose first/other based on m1 == m2 (deprecated, remains for backwards compatibility) */ #define PB_DATAOFFSET_CHOOSE(st, m1, m2) (int)(offsetof(st, m1) == offsetof(st, m2) \ ? PB_DATAOFFSET_FIRST(st, m1, m2) \