diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-02-20 15:17:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-25 13:21:56 +0100 |
| commit | 13d75be492897b078546c8175c9ee22290d8d20e (patch) | |
| tree | 258a443704e21ff1b8babb8bf76ced652886cc6d /canvas | |
| parent | 01b908543edbfa69266aef4023f65b5f4a75b272 (diff) | |
werror: declaration hides previous declaration
Change-Id: I0f8422a4f8c27ec253d917985d2593d8d87bb5f0
Reviewed-on: https://gerrit.libreoffice.org/22685
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit d375cafef68e8be9d0d35cbb535b8481a3913ace)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/directx/dx_winstuff.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index 0d629b431d76..021f82798b18 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 |