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

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
dce98a8d · xfxyjwf · 8d5f1e1e · 0a3e36f1 · dce98a8d
Commit dce98a8d authored Sep 19, 2014 by xfxyjwf
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

platform_macros.h src/google/protobuf/stubs/platform_macros.h +2 -0

No files found.
--- 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_