diff options
| author | Yu Shan <shanyu@google.com> | 2018-08-16 17:30:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-16 17:30:25 -0700 |
| commit | 09df97cd8f28130bd14258dd0a4b82ae0e14e6d8 (patch) | |
| tree | a59f0b9620389ebb642366debccffc2cd0455d79 | |
| parent | b0f82e0ec5609497f1da885370a95e8f162ce47a (diff) | |
| parent | c9c123244c4432673f5757241263e9dde8380fe0 (diff) | |
| download | nanopb-c-09df97cd8f28130bd14258dd0a4b82ae0e14e6d8.tar.gz | |
Add legacy macro definition for precompiled files.
am: c9c123244c
Change-Id: I9e92c461533bd666e4d9b89439526ffc4511fed4
| -rw-r--r-- | patches/pb.h.patch | 27 | ||||
| -rw-r--r-- | pb.h | 6 |
2 files changed, 33 insertions, 0 deletions
diff --git a/patches/pb.h.patch b/patches/pb.h.patch new file mode 100644 index 0000000..f269b7d --- /dev/null +++ b/patches/pb.h.patch @@ -0,0 +1,27 @@ +diff --git a/pb.h b/pb.h +index 174a84b..52d24de 100644 +--- a/pb.h ++++ b/pb.h +@@ -122,6 +122,11 @@ + #define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) + #define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##LINE##COUNTER + #endif ++#ifndef STATIC_ASSERT ++#define STATIC_ASSERT PB_STATIC_ASSERT ++#define STATIC_ASSERT_MSG PB_STATIC_ASSERT_MSG ++#define STATIC_ASSERT_MSG_ PB_STATIC_ASSERT_MSG_ ++#endif + #else + #define PB_STATIC_ASSERT(COND,MSG) + #endif +@@ -526,6 +531,7 @@ struct pb_extension_s { + PB_ ## rules ## _ ## allocation(tag, message, field, \ + PB_DATAOFFSET_ ## placement(message, field, prevfield), \ + PB_LTYPE_MAP_ ## type, ptr) ++#define PB_FIELD2 PB_FIELD + + /* Field description for repeated static fixed count fields.*/ + #define PB_REPEATED_FIXED_COUNT(tag, type, placement, message, field, prevfield, ptr) \ +-- +2.18.0.345.g5c9ce644c3-goog + @@ -122,6 +122,11 @@ #define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) #define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##LINE##COUNTER #endif +#ifndef STATIC_ASSERT +#define STATIC_ASSERT PB_STATIC_ASSERT +#define STATIC_ASSERT_MSG PB_STATIC_ASSERT_MSG +#define STATIC_ASSERT_MSG_ PB_STATIC_ASSERT_MSG_ +#endif #else #define PB_STATIC_ASSERT(COND,MSG) #endif @@ -526,6 +531,7 @@ struct pb_extension_s { PB_ ## rules ## _ ## allocation(tag, message, field, \ PB_DATAOFFSET_ ## placement(message, field, prevfield), \ PB_LTYPE_MAP_ ## type, ptr) +#define PB_FIELD2 PB_FIELD /* Field description for repeated static fixed count fields.*/ #define PB_REPEATED_FIXED_COUNT(tag, type, placement, message, field, prevfield, ptr) \ |