diff options
| author | xfxyjwf <xfxyjwf@gmail.com> | 2014-09-18 17:31:23 -0700 |
|---|---|---|
| committer | xfxyjwf <xfxyjwf@gmail.com> | 2014-09-18 17:31:23 -0700 |
| commit | dce98a8d4c662b94c4840a58f3c0263bf5c5e4c8 (patch) | |
| tree | 6caf4114f42c328a73ff0eda775a138c5256c72c | |
| parent | 8d5f1e1efb6c1a99aa4997d519767d5865e06e03 (diff) | |
| parent | 0a3e36f1bf443fe201cce79d8fecb5b98b178155 (diff) | |
| download | protobuf-dce98a8d4c662b94c4840a58f3c0263bf5c5e4c8.tar.gz protobuf-dce98a8d4c662b94c4840a58f3c0263bf5c5e4c8.tar.bz2 protobuf-dce98a8d4c662b94c4840a58f3c0263bf5c5e4c8.zip | |
Merge pull request #29 from edmonds/branches/undef_GOOGLE_PROTOBUF_PLATFORM_ERROR
platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer needed
| -rw-r--r-- | src/google/protobuf/stubs/platform_macros.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index 1d1d59a7..02186816 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -89,4 +89,6 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #define GOOGLE_PROTOBUF_OS_NACL #endif +#undef GOOGLE_PROTOBUF_PLATFORM_ERROR + #endif // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_ |