diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | freedreno/freedreno_priv.h | 2 | ||||
| -rw-r--r-- | intel/intel_bufmgr_gem.c | 4 | ||||
| -rw-r--r-- | meson.build | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 993c2a27..a0246fe5 100644 --- a/configure.ac +++ b/configure.ac @@ -509,6 +509,8 @@ if test "x$VALGRIND" = "xyes"; then AC_MSG_ERROR([Valgrind support required but not present]) fi AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warnings]) +else + AC_DEFINE([HAVE_VALGRIND], 0) fi AC_MSG_RESULT([$VALGRIND]) diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h index 199ccb94..81ad6092 100644 --- a/freedreno/freedreno_priv.h +++ b/freedreno/freedreno_priv.h @@ -200,7 +200,7 @@ offset_bytes(void *end, void *start) return ((char *)end) - ((char *)start); } -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND # include <memcheck.h> /* diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c index 71f140f5..386da30e 100644 --- a/intel/intel_bufmgr_gem.c +++ b/intel/intel_bufmgr_gem.c @@ -66,7 +66,7 @@ #include "i915_drm.h" #include "uthash.h" -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND #include <valgrind.h> #include <memcheck.h> #define VG(x) x @@ -1629,7 +1629,7 @@ int drm_intel_gem_bo_map_unsynchronized(drm_intel_bo *bo) { drm_intel_bufmgr_gem *bufmgr_gem = (drm_intel_bufmgr_gem *) bo->bufmgr; -#ifdef HAVE_VALGRIND +#if HAVE_VALGRIND drm_intel_bo_gem *bo_gem = (drm_intel_bo_gem *) bo; #endif int ret; diff --git a/meson.build b/meson.build index 15a1d405..76a081a9 100644 --- a/meson.build +++ b/meson.build @@ -257,16 +257,13 @@ foreach t : [[with_intel, 'INTEL'], [with_vmwgfx, 'VMWGFX'], [with_vc4, 'VC4'], [with_freedreno_kgsl, 'FREEDRENO_KGSL'], [dep_cairo.found(), 'CAIRO'], + [dep_valgrind.found(), 'VALGRIND'], [with_radeon, 'RADEON']] config.set10('HAVE_@0@'.format(t[1]), t[0]) endforeach if with_freedreno_kgsl and not with_freedreno error('cannot enable freedreno-kgsl without freedreno support') endif -if dep_valgrind.found() - config.set10('HAVE_VALGRIND', true) -endif - config.set10('_GNU_SOURCE', true) config_file = configure_file( configuration : config, |