From df01a21bebbad2313578f0161de9e426def758b9 Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Sat, 13 Jan 2024 16:06:17 -0500 Subject: [PATCH] Fix another error in zlib setup tweak --- .github/workflows/ci-x86.yml | 2 +- drheapstat/drheapstat.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-x86.yml b/.github/workflows/ci-x86.yml index 5b78ea6b2..b52d8f914 100644 --- a/.github/workflows/ci-x86.yml +++ b/.github/workflows/ci-x86.yml @@ -78,7 +78,7 @@ jobs: sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/ - popd + rm *.deb # Downgrade from cmake 3.20 to avoid 32-bit toolchain problems (DRi#4830). - name: Downgrade cmake diff --git a/drheapstat/drheapstat.c b/drheapstat/drheapstat.c index 7f642ad0c..920f75020 100644 --- a/drheapstat/drheapstat.c +++ b/drheapstat/drheapstat.c @@ -1,5 +1,5 @@ /* ********************************************************** - * Copyright (c) 2010-2021 Google, Inc. All rights reserved. + * Copyright (c) 2010-2024 Google, Inc. All rights reserved. * Copyright (c) 2009-2010 VMware, Inc. All rights reserved. * **********************************************************/ @@ -1293,7 +1293,7 @@ insert_instr_counter(void *drcontext, instrlist_t *bb, static dr_emit_flags_t event_bb_app2app(void *drcontext, void *tag, instrlist_t *bb, - bool for_trace, bool translating, void **user_data OUT) + bool for_trace, bool translating, void **user_data DR_PARAM_OUT) { /* we pass bi among all 4 phases */ instru_info_t *ii = thread_alloc(drcontext, sizeof(*ii), HEAPSTAT_PERBB);