diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-08-01 22:18:01 +0000 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-08-01 22:18:19 +0000 |
| commit | 87d0181db0cfcf684371e2d81c0a04ed13cf5fe9 (patch) | |
| tree | 9aa05df75ba4f5da6459d0192fb5f937a34eaa90 | |
| parent | da4f2d36bd4325c3dadf214f78f6975d304d0fb3 (diff) | |
| download | nanopb-c-87d0181db0cfcf684371e2d81c0a04ed13cf5fe9.tar.gz | |
Revert "Add legacy macro definition for precompiled files."
This reverts commit c31a0b32ffe7748c64527e9b030d0358ad114bf7.
Reason for revert: topic broke the build
Bug: 111798740
Change-Id: Ia2943f54953d5a57a2e2ef06005b3f50cf92ea58
| -rw-r--r-- | patches/pb.h.patch | 27 | ||||
| -rw-r--r-- | pb.h | 6 |
2 files changed, 0 insertions, 33 deletions
diff --git a/patches/pb.h.patch b/patches/pb.h.patch deleted file mode 100644 index f269b7d..0000000 --- a/patches/pb.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -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,11 +122,6 @@ #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 @@ -531,7 +526,6 @@ 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) \ |