summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2020-11-11 16:10:03 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-11 20:26:13 +0100
commitc74f614a4cc7a2b0c9ba6d9eaf24c77d8db5e12b (patch)
tree4128457e2bb6d010773673957873d60d3182adb8 /vcl
parentf7ca7e19942b02b4a19df72a3ca5f6c5fd861887 (diff)
Fix 64-bit --disable-pch build on Windows
Change-Id: Ieeef0309faa77558fb30fceaed83ad97fb6e26ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105590 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/win/saldata.hxx4
-rw-r--r--vcl/win/gdi/gdiimpl.hxx3
2 files changed, 5 insertions, 2 deletions
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index eadc7ade8957..b12352ee2e9d 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -28,6 +28,8 @@
#include <svdata.hxx>
#include <salwtype.hxx>
+#include <tools/long.hxx>
+
#include <win/wincomp.hxx>
#include <set>
@@ -86,7 +88,7 @@ public:
HGLOBAL mhDitherDIB; // dither memory handle
BYTE* mpDitherDIB; // dither memory
BYTE* mpDitherDIBData; // beginning of DIB data
- long* mpDitherDiff; // Dither mapping table
+ tools::Long* mpDitherDiff; // Dither mapping table
BYTE* mpDitherLow; // Dither mapping table
BYTE* mpDitherHigh; // Dither mapping table
HHOOK mhSalObjMsgHook; // hook to get interesting msg for SalObject
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index c6844a2b4325..52cbd8c53a62 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_VCL_WIN_GDI_GDIIMPL_HXX
#include <salgdiimpl.hxx>
+#include <tools/long.hxx>
#include <win/salgdi.h>
#include <win/wingdiimpl.hxx>
@@ -51,7 +52,7 @@ private:
Color maFillColor;
bool TryDrawBitmapGDIPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap);
- void DrawPixelImpl(long nX, long nY, COLORREF crColor);
+ void DrawPixelImpl(tools::Long nX, tools::Long nY, COLORREF crColor);
HPEN SearchStockPen(COLORREF nPenColor);
HPEN MakePen(Color nColor);