summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-27 15:35:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-27 15:35:02 +0100
commit49313b0626356f4726dc3bd52b237bbb81928a36 (patch)
tree6c566f26d5d56a61f2d5eb814512893a12bcf4c5 /vcl/unx
parenta0a58556f36cbf396f5139e18881720ed838ddd4 (diff)
Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx12
1 files changed, 6 insertions, 6 deletions
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