Fix another error in zlib setup tweak

DynamoRIO · Jan 13, 2024 · df01a21 · df01a21
1 parent 49163b7
commit df01a21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);