diff options
| author | Christopher Ferris <cferris@google.com> | 2018-07-27 13:08:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-27 13:08:29 -0700 |
| commit | 1ed52a9d94362105b3bb15e2b46ec0e836a5220f (patch) | |
| tree | 9aa05df75ba4f5da6459d0192fb5f937a34eaa90 | |
| parent | 71cfe23cf7c1c79968b270c0027506a7f05c63cf (diff) | |
| parent | 798b76ea4d3564d2b92fc84da3cbedf0fbdba580 (diff) | |
| download | nanopb-c-1ed52a9d94362105b3bb15e2b46ec0e836a5220f.tar.gz | |
Revert "Add legacy macro definition for precompiled files."
am: 798b76ea4d
Change-Id: I7153c89534dbd4f9451992cfa7dea63be157c1c6
| -rw-r--r-- | pb.h | 6 | ||||
| -rw-r--r-- | pb.h.patch | 27 |
2 files changed, 0 insertions, 33 deletions
@@ -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) \ diff --git a/pb.h.patch b/pb.h.patch deleted file mode 100644 index f269b7d..0000000 --- a/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 - |