From 798b76ea4d3564d2b92fc84da3cbedf0fbdba580 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Fri, 27 Jul 2018 19:17:19 +0000 Subject: Revert "Add legacy macro definition for precompiled files." This reverts commit a566afc9e10066fffdce5206976108e3abf6dda1. Reason for revert: Caused build failures. Change-Id: Ie2411af5f82a42aa32e3004febbfd65447051bc8 --- pb.h | 6 ------ pb.h.patch | 27 --------------------------- 2 files changed, 33 deletions(-) delete mode 100644 pb.h.patch diff --git a/pb.h b/pb.h index 52d24de..174a84b 100644 --- a/pb.h +++ b/pb.h @@ -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 - -- cgit v1.2.3