diff options
| author | Tim Rowley <[email protected]> | 2016-11-07 16:11:45 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-11-14 09:02:53 -0600 |
| commit | e9a3ad164db220d4517a3bb684ce6d01d01f0087 (patch) | |
| tree | fc9131fee26526fa0048eea5910f3f4fab68a0a8 | |
| parent | cd8d840ce1a8abab490d1e8c7bafa2cbb5399c4f (diff) | |
swr: [rasterizer common] don't bleed NOMINMAX definition after <windows.h>
Reviewed-by: Bruce Cherniak <[email protected]>
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/os.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index ac52b605cc2..28e7ff54f96 100644 --- a/src/gallium/drivers/swr/rasterizer/common/os.h +++ b/src/gallium/drivers/swr/rasterizer/common/os.h @@ -33,8 +33,11 @@ #ifndef NOMINMAX #define NOMINMAX -#endif #include <windows.h> +#undef NOMINMAX +#else +#include <windows.h> +#endif #include <intrin.h> #include <cstdint> |