Module: Mesa Branch: master Commit: e9a3ad164db220d4517a3bb684ce6d01d01f0087 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9a3ad164db220d4517a3bb684ce6d01d01f0087
Author: Tim Rowley <[email protected]> Date: Mon Nov 7 16:11:45 2016 -0600 swr: [rasterizer common] don't bleed NOMINMAX definition after <windows.h> Reviewed-by: Bruce Cherniak <[email protected]> --- src/gallium/drivers/swr/rasterizer/common/os.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index ac52b60..28e7ff5 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> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
