Merge pull request #29 from edmonds/branches/undef_GOOGLE_PROTOBUF_PLATFORM_ERROR · dce98a8d4c - Gogs

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

xfxyjwf 11 years ago

parent

8d5f1e1efb 0a3e36f1bf

commit

dce98a8d4c

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
src/google/protobuf/stubs/platform_macros.h
							 
								View File
							
				@@ -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_