diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-19 02:37:59 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-19 02:37:59 +0000 |
| commit | 728aa760fdb0e0ddfe1f6a6c0f48a5d625189c8d (patch) | |
| tree | a87804bf9914f549f4abb7157676e70e629f52fc /src/google/protobuf/descriptor.h | |
| parent | 0b30eb8c87a42ec63d41b943f9536bb94fc3c35b (diff) | |
Down-integrate form internal opensource branch
Diffstat (limited to 'src/google/protobuf/descriptor.h')
| -rw-r--r-- | src/google/protobuf/descriptor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/google/protobuf/descriptor.h b/src/google/protobuf/descriptor.h index 9e157798..33e3af72 100644 --- a/src/google/protobuf/descriptor.h +++ b/src/google/protobuf/descriptor.h @@ -58,6 +58,10 @@ #include <vector> #include <google/protobuf/stubs/common.h> +// TYPE_BOOL is defined in the MacOS's ConditionalMacros.h. +#ifdef TYPE_BOOL +#undef TYPE_BOOL +#endif // TYPE_BOOL namespace google { namespace protobuf { |