diff options
| author |  kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-22 20:06:20 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-22 20:06:20 +0000 |
| commit | 709ea28f3264aa5632e5577a4080671173fc6166 (patch) | |
| tree | ebb91c2bdf45990cec0829ecf137eef69e130666 /src/google/protobuf/test_util.cc | |
| parent | 6f9bc71ffdf84d7cb0288112970659a94a2f13ae (diff) | |
Work around windows.h #defining GetMessage().
Diffstat (limited to 'src/google/protobuf/test_util.cc')
| -rw-r--r-- | src/google/protobuf/test_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/google/protobuf/test_util.cc b/src/google/protobuf/test_util.cc index c1e9fa78..60413f6d 100644 --- a/src/google/protobuf/test_util.cc +++ b/src/google/protobuf/test_util.cc @@ -32,6 +32,12 @@ // Based on original Protocol Buffers design by // Sanjay Ghemawat, Jeff Dean, and others. +#ifdef _WIN32 +// Verify that #icnluding windows.h does not break anything (e.g. because +// windows.h #defines GetMessage() as a macro). +#include <windows.h> +#endif + #include <google/protobuf/test_util.h> #include <google/protobuf/descriptor.h> #include <google/protobuf/message.h> |