mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

werror: declaration hides previous declaration

Browse Source 
Change-Id: I0f8422a4f8c27ec253d917985d2593d8d87bb5f0
Reviewed-on: https://gerrit.libreoffice.org/22685
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
David Ostrovsky
2016-02-20 15:17:42 +01:00
committed by Michael Stahl
parent fbe9f840d5
commit d375cafef6
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
canvas/source/directx/dx_winstuff.hxx
View File

@@ -49,8 +49,13 @@ typedef IDirect3DSurface9 surface_type;
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#endif #endif
#pragma warning(push, 1)
#pragma warning(disable: 4458)
#include <gdiplus.h> #include <gdiplus.h>
#pragma warning(pop)
#undef max #undef max
#undef min #undef min