diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2017-03-14 23:12:52 +0000 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2017-03-14 23:41:54 +0000 |
| commit | 416f90939d4de58fe1a4e2489120010313183291 (patch) | |
| tree | 4c879e5f8255c7d8ffbec69954042331cf1eee09 /src/google/protobuf/compiler/plugin.pb.h | |
| parent | 43f2db776c265a9b22500e7a67af583b2b4ce85f (diff) | |
Fix freebsd build.
It turns out system headers included by generated plugin.pb.h file already contains
major/minor macro definitions when built on FreeBSD and we need to add #undefs to
the generated header file.
This change also fixes another compile error regarding EXPECT_DEATH on FreeBSD.
Diffstat (limited to 'src/google/protobuf/compiler/plugin.pb.h')
| -rw-r--r-- | src/google/protobuf/compiler/plugin.pb.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/plugin.pb.h b/src/google/protobuf/compiler/plugin.pb.h index 1b91daca..d6afb21b 100644 --- a/src/google/protobuf/compiler/plugin.pb.h +++ b/src/google/protobuf/compiler/plugin.pb.h @@ -30,6 +30,12 @@ #include <google/protobuf/unknown_field_set.h> #include <google/protobuf/descriptor.pb.h> // @@protoc_insertion_point(includes) +#ifdef major +#undef major +#endif +#ifdef minor +#undef minor +#endif namespace google { namespace protobuf { class DescriptorProto; |