From 49313b0626356f4726dc3bd52b237bbb81928a36 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 27 Nov 2012 15:35:02 +0100
Subject: Make python3 work with custom VALGRIND_CFLAGS

Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
---
 vcl/source/gdi/bitmap2.cxx     |  8 ++++----
 vcl/unx/generic/gdi/salbmp.cxx | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'vcl')

diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index c8ebbdea282d..43a0d405669b 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -27,8 +27,8 @@
 
 #include <utility>
 
-#if defined(HAVE_MEMCHECK_H)
-#include <memcheck.h>
+#if defined HAVE_VALGRIND_HEADERS
+#include <valgrind/memcheck.h>
 #endif
 
 
@@ -896,7 +896,7 @@ sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc )
 
 // ------------------------------------------------------------------
 
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
 namespace
 {
     void blankExtraSpace(sal_uInt8 *pBits, long nWidth, long nScanlineSize, int nBitCount)
@@ -980,7 +980,7 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
             const long  nWidth = rAcc.Width();
             const long  nHeight = rAcc.Height();
             sal_uInt8*      pBuf = new sal_uInt8[ nAlignedWidth ];
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
             if (RUNNING_ON_VALGRIND)
                 blankExtraSpace(pBuf, nWidth, nAlignedWidth, discretizeBitcount(nBitCount));
 #endif
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 0dbffa3ad8a3..aee24ddbf534 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -43,8 +43,8 @@
 #include <unx/salinst.h>
 #include <unx/x11/xlimits.hxx>
 
-#if defined(HAVE_MEMCHECK_H)
-#include <memcheck.h>
+#if defined HAVE_VALGRIND_HEADERS
+#include <valgrind/memcheck.h>
 #endif
 
 // -------------
@@ -101,7 +101,7 @@ void X11SalBitmap::ImplRemovedFromCache()
         delete mpDDB, mpDDB = NULL;
 }
 
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
 namespace
 {
     void blankExtraSpace(BitmapBuffer* pDIB)
@@ -192,7 +192,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
             try
             {
                 pDIB->mpBits = new sal_uInt8[ pDIB->mnScanlineSize * pDIB->mnHeight ];
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
                 if (RUNNING_ON_VALGRIND)
                     blankExtraSpace(pDIB);
 #endif
@@ -540,7 +540,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
 
             if( pDstBuf && pDstBuf->mpBits )
             {
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
                 if (RUNNING_ON_VALGRIND)
                     blankExtraSpace(pDstBuf);
 #endif
@@ -718,7 +718,7 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
         try
         {
             mpDIB->mpBits = new sal_uInt8[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
-#if defined(HAVE_MEMCHECK_H)
+#if defined HAVE_VALGRIND_HEADERS
             if (RUNNING_ON_VALGRIND)
                 blankExtraSpace(mpDIB);
 #endif
-- 
cgit