diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2018-09-04 10:58:54 -0700 |
| commit | d61aede89cf188367766b971f59cf57d7835d8e8 (patch) | |
| tree | a19842c62c3c8f51389912ecafdf932d0a572bea /src/google/protobuf/wire_format_unittest.cc | |
| parent | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (diff) | |
| download | protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.gz protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.tar.bz2 protobuf-d61aede89cf188367766b971f59cf57d7835d8e8.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/wire_format_unittest.cc')
| -rw-r--r-- | src/google/protobuf/wire_format_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/google/protobuf/wire_format_unittest.cc b/src/google/protobuf/wire_format_unittest.cc index 9dfd13b5..babdcc65 100644 --- a/src/google/protobuf/wire_format_unittest.cc +++ b/src/google/protobuf/wire_format_unittest.cc @@ -51,6 +51,8 @@ #include <google/protobuf/stubs/casts.h> #include <google/protobuf/stubs/stl_util.h> +#include <google/protobuf/port_def.inc> + namespace google { namespace protobuf { namespace internal { @@ -665,8 +667,8 @@ TEST(WireFormatTest, UnknownFieldRecursionLimit) { TEST(WireFormatTest, ZigZag) { // avoid line-wrapping -#define LL(x) GOOGLE_LONGLONG(x) -#define ULL(x) GOOGLE_ULONGLONG(x) +#define LL(x) PROTOBUF_LONGLONG(x) +#define ULL(x) PROTOBUF_ULONGLONG(x) #define ZigZagEncode32(x) WireFormatLite::ZigZagEncode32(x) #define ZigZagDecode32(x) WireFormatLite::ZigZagDecode32(x) #define ZigZagEncode64(x) WireFormatLite::ZigZagEncode64(x) |