canvas/source/directx/dx_winstuff.hxx | 5 +++++ 1 file changed, 5 insertions(+)
New commits: commit d375cafef68e8be9d0d35cbb535b8481a3913ace Author: David Ostrovsky <[email protected]> Date: Sat Feb 20 15:17:42 2016 +0100 werror: declaration hides previous declaration Change-Id: I0f8422a4f8c27ec253d917985d2593d8d87bb5f0 Reviewed-on: https://gerrit.libreoffice.org/22685 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 0d629b4..021f827 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -49,8 +49,13 @@ typedef IDirect3DSurface9 surface_type; #define min(a,b) (((a) < (b)) ? (a) : (b)) #endif +#pragma warning(push, 1) +#pragma warning(disable: 4458) + #include <gdiplus.h> +#pragma warning(pop) + #undef max #undef min _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
