diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
| commit | 49313b0626356f4726dc3bd52b237bbb81928a36 (patch) | |
| tree | 6c566f26d5d56a61f2d5eb814512893a12bcf4c5 /sal | |
| parent | a0a58556f36cbf396f5139e18881720ed838ddd4 (diff) | |
Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/signal.c | 10 | ||||
| -rw-r--r-- | sal/workben/makefile.mk | 4 | ||||
| -rw-r--r-- | sal/workben/measure_oustrings.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index 6a0ad28b6f36..e80a4eb85ffa 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -76,8 +76,8 @@ # define ACT_ABORT ACT_SYSTEM #endif -#if defined(HAVE_MEMCHECK_H) -#include <memcheck.h> +#if defined HAVE_VALGRIND_HEADERS +#include <valgrind/memcheck.h> #endif typedef struct _oslSignalHandlerImpl @@ -255,7 +255,7 @@ static sal_Bool InitSignal() /* Initialize the rest of the signals */ for (i = 0; i < NoSignals; ++i) { -#if defined(HAVE_MEMCHECK_H) +#if defined HAVE_VALGRIND_HEADERS if (Signals[i].Signal == SIGUSR2 && RUNNING_ON_VALGRIND) Signals[i].Action = ACT_IGNORE; #endif @@ -908,7 +908,7 @@ void CallSystemHandler(int Signal) } } -#if defined(HAVE_MEMCHECK_H) +#if defined HAVE_VALGRIND_HEADERS static void DUMPCURRENTALLOCS() { VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" ); @@ -965,7 +965,7 @@ void SignalHandlerFunction(int Signal) Info.Signal = osl_Signal_Terminate; break; -#if defined(HAVE_MEMCHECK_H) +#if defined HAVE_VALGRIND_HEADERS case SIGUSR2: if (RUNNING_ON_VALGRIND) DUMPCURRENTALLOCS(); diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk index 545b96db4994..eb3873aa3db5 100644 --- a/sal/workben/makefile.mk +++ b/sal/workben/makefile.mk @@ -96,8 +96,8 @@ APP4DEPN=$(SLB)$/sal.lib OBJFILES+=\ $(OBJ)$/measure_oustrings.obj -.IF "$(HAVE_CALLGRIND)" == "YES" -CFLAGSCXX+=-DHAVE_CALLGRIND +.IF "$(ENABLE_VALGRIND)" == "TRUE" +CFLAGSCXX+=-DHAVE_VALGRIND_HEADERS .ENDIF APP6TARGET=measure_oustrings diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index 480f178523a1..27cf907079db 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -36,7 +36,7 @@ #include <sstream> #include <fstream> -#ifdef HAVE_CALLGRIND +#if defined HAVE_VALGRIND_HEADERS # include <valgrind/callgrind.h> int COUNT = 1; #else |