Chromium Code Reviews| Index: include/core/SkPostConfig.h |
| diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h |
| index 39d4eb73ab1b61abb488e0e4a1e11dd105bf97d4..022757554cc1739245f6aa8b8580a93478be984f 100644 |
| --- a/include/core/SkPostConfig.h |
| +++ b/include/core/SkPostConfig.h |
| @@ -140,13 +140,23 @@ |
| #define WIN32_LEAN_AND_MEAN |
| #define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| #endif |
| + #ifndef NOMINMAX |
| + #define NOMINMAX |
| + #define NOMINMAX_WAS_LOCALLY_DEFINED |
| + #endif |
| #include <windows.h> |
| #ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| + #undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| #undef WIN32_LEAN_AND_MEAN |
| #endif |
| + #ifdef NOMINMAX_WAS_LOCALLY_DEFINED |
| + #undef NOMINMAX_WAS_LOCALLY_DEFINED |
| + #undef NOMINMAX |
| + #endif |
|
borenet
2013/07/25 14:17:05
Not sure if relevant here, but NOMINMAX is defined
|
| + |
| #ifndef SK_DEBUGBREAK |
| #define SK_DEBUGBREAK(cond) do { if (!(cond)) { SkNO_RETURN_HINT(); __debugbreak(); }} while (false) |
| #endif |