| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 | 9 |
| 10 #ifndef SkPostConfig_DEFINED | 10 #ifndef SkPostConfig_DEFINED |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 #define SK_USE_FLOATBITS | 133 #define SK_USE_FLOATBITS |
| 134 #endif | 134 #endif |
| 135 #endif | 135 #endif |
| 136 | 136 |
| 137 #ifdef SK_BUILD_FOR_WIN | 137 #ifdef SK_BUILD_FOR_WIN |
| 138 // we want lean_and_mean when we include windows.h | 138 // we want lean_and_mean when we include windows.h |
| 139 #ifndef WIN32_LEAN_AND_MEAN | 139 #ifndef WIN32_LEAN_AND_MEAN |
| 140 #define WIN32_LEAN_AND_MEAN | 140 #define WIN32_LEAN_AND_MEAN |
| 141 #define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED | 141 #define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| 142 #endif | 142 #endif |
| 143 #ifndef NOMINMAX |
| 144 #define NOMINMAX |
| 145 #define NOMINMAX_WAS_LOCALLY_DEFINED |
| 146 #endif |
| 143 | 147 |
| 144 #include <windows.h> | 148 #include <windows.h> |
| 145 | 149 |
| 146 #ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED | 150 #ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| 151 #undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED |
| 147 #undef WIN32_LEAN_AND_MEAN | 152 #undef WIN32_LEAN_AND_MEAN |
| 148 #endif | 153 #endif |
| 149 | 154 |
| 155 #ifdef NOMINMAX_WAS_LOCALLY_DEFINED |
| 156 #undef NOMINMAX_WAS_LOCALLY_DEFINED |
| 157 #undef NOMINMAX |
| 158 #endif |
| 159 |
| 150 #ifndef SK_DEBUGBREAK | 160 #ifndef SK_DEBUGBREAK |
| 151 #define SK_DEBUGBREAK(cond) do { if (!(cond)) { SkNO_RETURN_HINT();
__debugbreak(); }} while (false) | 161 #define SK_DEBUGBREAK(cond) do { if (!(cond)) { SkNO_RETURN_HINT();
__debugbreak(); }} while (false) |
| 152 #endif | 162 #endif |
| 153 | 163 |
| 154 #ifndef SK_A32_SHIFT | 164 #ifndef SK_A32_SHIFT |
| 155 #define SK_A32_SHIFT 24 | 165 #define SK_A32_SHIFT 24 |
| 156 #define SK_R32_SHIFT 16 | 166 #define SK_R32_SHIFT 16 |
| 157 #define SK_G32_SHIFT 8 | 167 #define SK_G32_SHIFT 8 |
| 158 #define SK_B32_SHIFT 0 | 168 #define SK_B32_SHIFT 0 |
| 159 #endif | 169 #endif |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 #else | 370 #else |
| 361 #define SK_SIZE_T_SPECIFIER "%zu" | 371 #define SK_SIZE_T_SPECIFIER "%zu" |
| 362 #endif | 372 #endif |
| 363 #endif | 373 #endif |
| 364 | 374 |
| 365 ////////////////////////////////////////////////////////////////////// | 375 ////////////////////////////////////////////////////////////////////// |
| 366 | 376 |
| 367 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 377 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| 368 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 378 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 |
| 369 #endif | 379 #endif |
| OLD | NEW |