1diff --git a/pb.h b/pb.h
2index 174a84b..52d24de 100644
3--- a/pb.h
4+++ b/pb.h
5@@ -122,6 +122,11 @@
6 #define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
7 #define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##LINE##COUNTER
8 #endif
9+#ifndef STATIC_ASSERT
10+#define STATIC_ASSERT PB_STATIC_ASSERT
11+#define STATIC_ASSERT_MSG PB_STATIC_ASSERT_MSG
12+#define STATIC_ASSERT_MSG_ PB_STATIC_ASSERT_MSG_
13+#endif
14 #else
15 #define PB_STATIC_ASSERT(COND,MSG)
16 #endif
17@@ -526,6 +531,7 @@ struct pb_extension_s {
18         PB_ ## rules ## _ ## allocation(tag, message, field, \
19         PB_DATAOFFSET_ ## placement(message, field, prevfield), \
20         PB_LTYPE_MAP_ ## type, ptr)
21+#define PB_FIELD2 PB_FIELD
22
23 /* Field description for repeated static fixed count fields.*/
24 #define PB_REPEATED_FIXED_COUNT(tag, type, placement, message, field, prevfield, ptr) \
25--
262.18.0.345.g5c9ce644c3-goog
27
28