From: Mika T. Lindqvist <postmaster@raasu.org>
Date: Wed, 14 Dec 2022 13:12:43 +0000 (+0200)
Subject: Sync with zlib 1.2.13 and declare compatibility.
X-Git-Tag: 2.1.0-beta1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5db5aa985dc4a882e6436f3f9273d09bf5aa89d;p=thirdparty%2Fzlib-ng.git

Sync with zlib 1.2.13 and declare compatibility.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 059017e1..1f667e8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,7 @@ elseif(MSVC)
 elseif(CMAKE_C_COMPILER_ID MATCHES "GNU" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
     # Enable warnings in GCC and Clang
     set(WARNFLAGS -Wall)
-    set(WARNFLAGS_MAINTAINER -Wextra -Wpedantic)
+    set(WARNFLAGS_MAINTAINER -Wextra)
     set(WARNFLAGS_DISABLE)
     if(WITH_NATIVE_INSTRUCTIONS)
         if(BASEARCH_PPC_FOUND)
diff --git a/README.md b/README.md
index 80b921b2..a40980a0 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ with zlib, then zlib-ng will temporarily be used instead by the program,
 without risking system-wide instability.
 
 ```
-LD_PRELOAD=/opt/zlib-ng/libz.so.1.2.12.zlib-ng /usr/bin/program
+LD_PRELOAD=/opt/zlib-ng/libz.so.1.2.13.zlib-ng /usr/bin/program
 ```
 
 ### Cmake
diff --git a/deflate.c b/deflate.c
index c94e065e..9d8002b9 100644
--- a/deflate.c
+++ b/deflate.c
@@ -59,7 +59,7 @@
 # undef deflateInit2
 #endif
 
-const char PREFIX(deflate_copyright)[] = " deflate 1.2.12 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
+const char PREFIX(deflate_copyright)[] = " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/inftrees.c b/inftrees.c
index 7a215bd6..78f6cf17 100644
--- a/inftrees.c
+++ b/inftrees.c
@@ -9,7 +9,7 @@
 
 #define MAXBITS 15
 
-const char PREFIX(inflate_copyright)[] = " inflate 1.2.12 Copyright 1995-2022 Mark Adler ";
+const char PREFIX(inflate_copyright)[] = " inflate 1.2.13 Copyright 1995-2022 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-aarch64-unknown-linux-gnu.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-aarch64-unknown-linux-gnu.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-aarch64-unknown-linux-gnu.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-aarch64-unknown-linux-gnu.abi
index e39b64cf..c9088b86 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-aarch64-unknown-linux-gnu.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-aarch64-unknown-linux-gnu.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-arm-aarch64' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-arm-aarch64' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-aarch64.so.1'/>
@@ -98,11 +98,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-2'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-3'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
-    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='248' column='1' id='type-id-6'/>
-    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='391' column='1' id='type-id-7'/>
-    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='393' column='1' id='type-id-8'/>
-    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='394' column='1' id='type-id-9'/>
-    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='251' column='1' id='type-id-6'/>
+    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='397' column='1' id='type-id-7'/>
+    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='399' column='1' id='type-id-8'/>
+    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='400' column='1' id='type-id-9'/>
+    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='406' column='1' id='type-id-10'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/aarch64-linux-gnu/include/bits/types.h' line='152' column='1' id='type-id-11'/>
     <typedef-decl name='__off64_t' type-id='type-id-1' filepath='/usr/aarch64-linux-gnu/include/bits/types.h' line='153' column='1' id='type-id-12'/>
     <typedef-decl name='off_t' type-id='type-id-11' filepath='/usr/aarch64-linux-gnu/include/sys/types.h' line='85' column='1' id='type-id-13'/>
@@ -136,7 +136,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='405' column='1' id='type-id-17'/>
+    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='411' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress2'>
       <parameter type-id='type-id-19' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -159,50 +159,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='429' column='1' id='type-id-21'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='435' column='1' id='type-id-21'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-22'/>
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
     <qualified-type-def type-id='type-id-21' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-25'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
@@ -230,8 +230,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-41'/>
     </array-type-def>
     <type-decl name='void' id='type-id-42'/>
-    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='402' column='1' id='type-id-43'/>
-    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='409' column='1' id='type-id-45'/>
+    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='408' column='1' id='type-id-43'/>
+    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='415' column='1' id='type-id-45'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-28'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -580,92 +580,92 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -694,13 +694,13 @@
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-42'/>
@@ -836,7 +836,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='410' column='1' id='type-id-91'/>
+    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='416' column='1' id='type-id-91'/>
     <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/aarch64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-92'/>
     <typedef-decl name='ssize_t' type-id='type-id-92' filepath='/usr/aarch64-linux-gnu/include/sys/types.h' line='108' column='1' id='type-id-93'/>
     <class-decl name='gz_state' size-in-bits='1920' is-struct='yes' naming-typedef-id='type-id-94' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-95'>
@@ -936,40 +936,40 @@
       <parameter type-id='type-id-78'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-68'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
   </abi-instr>
@@ -991,7 +991,7 @@
         <var-decl name='__vr_offs' type-id='type-id-20' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='408' column='1' id='type-id-99'/>
+    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='414' column='1' id='type-id-99'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-98' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-100'/>
     <typedef-decl name='va_list' type-id='type-id-100' filepath='/usr/lib/gcc-cross/aarch64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-101'/>
     <function-decl name='vsnprintf' filepath='/usr/aarch64-linux-gnu/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1098,16 +1098,16 @@
       <parameter type-id='type-id-20' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-108' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-110' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-108' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-110' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1150,80 +1150,80 @@
       <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
@@ -1277,8 +1277,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
-      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
+      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-78'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-126' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabi.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabi.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabi.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabi.abi
index 839c6ac9..48f8fb6b 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabi.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabi.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-arm' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-arm' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux.so.3'/>
@@ -99,11 +99,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
     <type-decl name='unsigned long int' size-in-bits='32' id='type-id-5'/>
-    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='248' column='1' id='type-id-7'/>
-    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='391' column='1' id='type-id-8'/>
-    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='393' column='1' id='type-id-9'/>
-    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='394' column='1' id='type-id-10'/>
-    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='400' column='1' id='type-id-11'/>
+    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='251' column='1' id='type-id-7'/>
+    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='397' column='1' id='type-id-8'/>
+    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='399' column='1' id='type-id-9'/>
+    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='406' column='1' id='type-id-11'/>
     <typedef-decl name='__int64_t' type-id='type-id-2' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='47' column='1' id='type-id-12'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='152' column='1' id='type-id-13'/>
     <typedef-decl name='__off64_t' type-id='type-id-12' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='153' column='1' id='type-id-14'/>
@@ -138,7 +138,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='405' column='1' id='type-id-19'/>
+    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='411' column='1' id='type-id-19'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='32' id='type-id-20'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='compress2'>
       <parameter type-id='type-id-21' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -161,50 +161,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='429' column='1' id='type-id-23'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='435' column='1' id='type-id-23'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='32' id='type-id-25'/>
     <qualified-type-def type-id='type-id-23' const='yes' id='type-id-26'/>
     <pointer-type-def type-id='type-id-26' size-in-bits='32' id='type-id-27'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
@@ -232,8 +232,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-43'/>
     </array-type-def>
     <type-decl name='void' id='type-id-44'/>
-    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='402' column='1' id='type-id-45'/>
-    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='409' column='1' id='type-id-47'/>
+    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='408' column='1' id='type-id-45'/>
+    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='415' column='1' id='type-id-47'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-48' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -582,92 +582,92 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -696,13 +696,13 @@
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-47'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-44'/>
@@ -838,7 +838,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='410' column='1' id='type-id-93'/>
+    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='416' column='1' id='type-id-93'/>
     <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/arm-linux-gnueabi/include/bits/types.h' line='194' column='1' id='type-id-94'/>
     <typedef-decl name='ssize_t' type-id='type-id-94' filepath='/usr/arm-linux-gnueabi/include/sys/types.h' line='108' column='1' id='type-id-95'/>
     <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-96' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-97'>
@@ -938,40 +938,40 @@
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-7'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
@@ -981,7 +981,7 @@
         <var-decl name='__ap' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='408' column='1' id='type-id-101'/>
+    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='414' column='1' id='type-id-101'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-100' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='40' column='1' id='type-id-102'/>
     <typedef-decl name='va_list' type-id='type-id-102' filepath='/usr/lib/gcc-cross/arm-linux-gnueabi/11/include/stdarg.h' line='99' column='1' id='type-id-103'/>
     <function-decl name='vsnprintf' filepath='/usr/arm-linux-gnueabi/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1088,16 +1088,16 @@
       <parameter type-id='type-id-22' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-110' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-112' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-110' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-112' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1140,80 +1140,80 @@
       <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -1267,8 +1267,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
-      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
+      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-80'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-128' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabihf.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabihf.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabihf.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabihf.abi
index fd5f2ade..cee35ca4 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-arm-unknown-linux-gnueabihf.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-arm-unknown-linux-gnueabihf.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-arm' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-arm' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-armhf.so.3'/>
@@ -99,11 +99,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
     <type-decl name='unsigned long int' size-in-bits='32' id='type-id-5'/>
-    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='248' column='1' id='type-id-7'/>
-    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='391' column='1' id='type-id-8'/>
-    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='393' column='1' id='type-id-9'/>
-    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='394' column='1' id='type-id-10'/>
-    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='400' column='1' id='type-id-11'/>
+    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='251' column='1' id='type-id-7'/>
+    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='397' column='1' id='type-id-8'/>
+    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='399' column='1' id='type-id-9'/>
+    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='406' column='1' id='type-id-11'/>
     <typedef-decl name='__int64_t' type-id='type-id-2' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='47' column='1' id='type-id-12'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='152' column='1' id='type-id-13'/>
     <typedef-decl name='__off64_t' type-id='type-id-12' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='153' column='1' id='type-id-14'/>
@@ -138,7 +138,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='405' column='1' id='type-id-19'/>
+    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='411' column='1' id='type-id-19'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='32' id='type-id-20'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='compress2'>
       <parameter type-id='type-id-21' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -161,50 +161,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='429' column='1' id='type-id-23'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='435' column='1' id='type-id-23'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='32' id='type-id-25'/>
     <qualified-type-def type-id='type-id-23' const='yes' id='type-id-26'/>
     <pointer-type-def type-id='type-id-26' size-in-bits='32' id='type-id-27'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
@@ -232,8 +232,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-43'/>
     </array-type-def>
     <type-decl name='void' id='type-id-44'/>
-    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='402' column='1' id='type-id-45'/>
-    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='409' column='1' id='type-id-47'/>
+    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='408' column='1' id='type-id-45'/>
+    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='415' column='1' id='type-id-47'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-48' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -582,92 +582,92 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -696,13 +696,13 @@
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-47'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-44'/>
@@ -838,7 +838,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='410' column='1' id='type-id-93'/>
+    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='416' column='1' id='type-id-93'/>
     <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/arm-linux-gnueabihf/include/bits/types.h' line='194' column='1' id='type-id-94'/>
     <typedef-decl name='ssize_t' type-id='type-id-94' filepath='/usr/arm-linux-gnueabihf/include/sys/types.h' line='108' column='1' id='type-id-95'/>
     <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-96' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-97'>
@@ -938,40 +938,40 @@
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-7'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
@@ -981,7 +981,7 @@
         <var-decl name='__ap' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='408' column='1' id='type-id-101'/>
+    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='414' column='1' id='type-id-101'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-100' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='40' column='1' id='type-id-102'/>
     <typedef-decl name='va_list' type-id='type-id-102' filepath='/usr/lib/gcc-cross/arm-linux-gnueabihf/11/include/stdarg.h' line='99' column='1' id='type-id-103'/>
     <function-decl name='vsnprintf' filepath='/usr/arm-linux-gnueabihf/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1088,16 +1088,16 @@
       <parameter type-id='type-id-22' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-110' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-112' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-110' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-112' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1140,80 +1140,80 @@
       <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -1267,8 +1267,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
-      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
+      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-80'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-128' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc-unknown-linux-gnu.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc-unknown-linux-gnu.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc-unknown-linux-gnu.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc-unknown-linux-gnu.abi
index 3bd1f5b1..3d7ca82c 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc-unknown-linux-gnu.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc-unknown-linux-gnu.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-powerpc' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-powerpc' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -98,11 +98,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
     <type-decl name='unsigned long int' size-in-bits='32' id='type-id-5'/>
-    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='248' column='1' id='type-id-7'/>
-    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='391' column='1' id='type-id-8'/>
-    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='393' column='1' id='type-id-9'/>
-    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='394' column='1' id='type-id-10'/>
-    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='400' column='1' id='type-id-11'/>
+    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='251' column='1' id='type-id-7'/>
+    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='397' column='1' id='type-id-8'/>
+    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='399' column='1' id='type-id-9'/>
+    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='406' column='1' id='type-id-11'/>
     <typedef-decl name='size_t' type-id='type-id-4' filepath='/usr/lib/gcc-cross/powerpc-linux-gnu/11/include/stddef.h' line='209' column='1' id='type-id-6'/>
     <typedef-decl name='__int64_t' type-id='type-id-2' filepath='/usr/powerpc-linux-gnu/include/bits/types.h' line='47' column='1' id='type-id-12'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/powerpc-linux-gnu/include/bits/types.h' line='152' column='1' id='type-id-13'/>
@@ -137,7 +137,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='405' column='1' id='type-id-19'/>
+    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='411' column='1' id='type-id-19'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='32' id='type-id-20'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='compress2'>
       <parameter type-id='type-id-21' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -160,50 +160,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='429' column='1' id='type-id-23'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='435' column='1' id='type-id-23'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='32' id='type-id-25'/>
     <qualified-type-def type-id='type-id-23' const='yes' id='type-id-26'/>
     <pointer-type-def type-id='type-id-26' size-in-bits='32' id='type-id-27'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
@@ -231,8 +231,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-43'/>
     </array-type-def>
     <type-decl name='void' id='type-id-44'/>
-    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='402' column='1' id='type-id-45'/>
-    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='409' column='1' id='type-id-47'/>
+    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='408' column='1' id='type-id-45'/>
+    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='415' column='1' id='type-id-47'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-48' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -581,92 +581,92 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -695,13 +695,13 @@
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-47'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-44'/>
@@ -837,7 +837,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='410' column='1' id='type-id-93'/>
+    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='416' column='1' id='type-id-93'/>
     <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/powerpc-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-94'/>
     <typedef-decl name='ssize_t' type-id='type-id-94' filepath='/usr/powerpc-linux-gnu/include/sys/types.h' line='108' column='1' id='type-id-95'/>
     <class-decl name='gz_state' size-in-bits='1344' is-struct='yes' naming-typedef-id='type-id-96' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-97'>
@@ -937,40 +937,40 @@
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-7'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
@@ -992,7 +992,7 @@
         <var-decl name='reg_save_area' type-id='type-id-46' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='408' column='1' id='type-id-101'/>
+    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='414' column='1' id='type-id-101'/>
     <pointer-type-def type-id='type-id-100' size-in-bits='32' id='type-id-102'/>
     <function-decl name='vsnprintf' filepath='/usr/powerpc-linux-gnu/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-70'/>
@@ -1098,16 +1098,16 @@
       <parameter type-id='type-id-22' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-109' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-111' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-109' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-111' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1150,80 +1150,80 @@
       <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -1277,8 +1277,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
-      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
+      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-80'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-127' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64-unknown-linux-gnu.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64-unknown-linux-gnu.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64-unknown-linux-gnu.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64-unknown-linux-gnu.abi
index 161d088f..ad037fd6 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64-unknown-linux-gnu.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64-unknown-linux-gnu.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-powerpc-64' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-powerpc-64' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -97,11 +97,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-2'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-3'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
-    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='248' column='1' id='type-id-6'/>
-    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='391' column='1' id='type-id-7'/>
-    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='393' column='1' id='type-id-8'/>
-    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='394' column='1' id='type-id-9'/>
-    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='251' column='1' id='type-id-6'/>
+    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='397' column='1' id='type-id-7'/>
+    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='399' column='1' id='type-id-8'/>
+    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='400' column='1' id='type-id-9'/>
+    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='406' column='1' id='type-id-10'/>
     <typedef-decl name='size_t' type-id='type-id-4' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stddef.h' line='209' column='1' id='type-id-5'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/powerpc64-linux-gnu/include/bits/types.h' line='152' column='1' id='type-id-11'/>
     <typedef-decl name='__off64_t' type-id='type-id-1' filepath='/usr/powerpc64-linux-gnu/include/bits/types.h' line='153' column='1' id='type-id-12'/>
@@ -135,7 +135,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='405' column='1' id='type-id-17'/>
+    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='411' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress2'>
       <parameter type-id='type-id-19' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -158,50 +158,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='429' column='1' id='type-id-21'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='435' column='1' id='type-id-21'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-22'/>
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
     <qualified-type-def type-id='type-id-21' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-25'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
@@ -229,8 +229,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-41'/>
     </array-type-def>
     <type-decl name='void' id='type-id-42'/>
-    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='402' column='1' id='type-id-43'/>
-    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='409' column='1' id='type-id-45'/>
+    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='408' column='1' id='type-id-43'/>
+    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='415' column='1' id='type-id-45'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-28'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -579,92 +579,92 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -693,13 +693,13 @@
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-42'/>
@@ -835,7 +835,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='410' column='1' id='type-id-91'/>
+    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='416' column='1' id='type-id-91'/>
     <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-92'/>
     <typedef-decl name='ssize_t' type-id='type-id-92' filepath='/usr/powerpc64-linux-gnu/include/sys/types.h' line='108' column='1' id='type-id-93'/>
     <class-decl name='gz_state' size-in-bits='1920' is-struct='yes' naming-typedef-id='type-id-94' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-95'>
@@ -935,45 +935,45 @@
       <parameter type-id='type-id-78'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-68'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='408' column='1' id='type-id-98'/>
+    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='414' column='1' id='type-id-98'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-68' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-99'/>
     <typedef-decl name='va_list' type-id='type-id-99' filepath='/usr/lib/gcc-cross/powerpc64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-100'/>
     <function-decl name='vsnprintf' filepath='/usr/powerpc64-linux-gnu/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1080,16 +1080,16 @@
       <parameter type-id='type-id-20' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1132,80 +1132,80 @@
       <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
@@ -1259,8 +1259,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
-      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
+      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-78'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-125' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64le-unknown-linux-gnu.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64le-unknown-linux-gnu.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64le-unknown-linux-gnu.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64le-unknown-linux-gnu.abi
index bb67512a..5ef350b4 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-powerpc64le-unknown-linux-gnu.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-powerpc64le-unknown-linux-gnu.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-powerpc-64' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-powerpc-64' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -97,11 +97,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-2'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-3'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
-    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='248' column='1' id='type-id-6'/>
-    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='391' column='1' id='type-id-7'/>
-    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='393' column='1' id='type-id-8'/>
-    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='394' column='1' id='type-id-9'/>
-    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='251' column='1' id='type-id-6'/>
+    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='397' column='1' id='type-id-7'/>
+    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='399' column='1' id='type-id-8'/>
+    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='400' column='1' id='type-id-9'/>
+    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='406' column='1' id='type-id-10'/>
     <typedef-decl name='size_t' type-id='type-id-4' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stddef.h' line='209' column='1' id='type-id-5'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/powerpc64le-linux-gnu/include/bits/types.h' line='152' column='1' id='type-id-11'/>
     <typedef-decl name='__off64_t' type-id='type-id-1' filepath='/usr/powerpc64le-linux-gnu/include/bits/types.h' line='153' column='1' id='type-id-12'/>
@@ -135,7 +135,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='405' column='1' id='type-id-17'/>
+    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='411' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress2'>
       <parameter type-id='type-id-19' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -158,50 +158,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='429' column='1' id='type-id-21'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='435' column='1' id='type-id-21'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-22'/>
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
     <qualified-type-def type-id='type-id-21' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-25'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
@@ -229,8 +229,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-41'/>
     </array-type-def>
     <type-decl name='void' id='type-id-42'/>
-    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='402' column='1' id='type-id-43'/>
-    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='409' column='1' id='type-id-45'/>
+    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='408' column='1' id='type-id-43'/>
+    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='415' column='1' id='type-id-45'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-28'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -579,92 +579,92 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -693,13 +693,13 @@
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-42'/>
@@ -835,7 +835,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='410' column='1' id='type-id-91'/>
+    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='416' column='1' id='type-id-91'/>
     <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/powerpc64le-linux-gnu/include/bits/types.h' line='194' column='1' id='type-id-92'/>
     <typedef-decl name='ssize_t' type-id='type-id-92' filepath='/usr/powerpc64le-linux-gnu/include/sys/types.h' line='108' column='1' id='type-id-93'/>
     <class-decl name='gz_state' size-in-bits='1920' is-struct='yes' naming-typedef-id='type-id-94' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-95'>
@@ -935,45 +935,45 @@
       <parameter type-id='type-id-78'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-68'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='408' column='1' id='type-id-98'/>
+    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='414' column='1' id='type-id-98'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-68' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-99'/>
     <typedef-decl name='va_list' type-id='type-id-99' filepath='/usr/lib/gcc-cross/powerpc64le-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-100'/>
     <function-decl name='vsnprintf' filepath='/usr/powerpc64le-linux-gnu/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1080,16 +1080,16 @@
       <parameter type-id='type-id-20' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1132,80 +1132,80 @@
       <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
@@ -1259,8 +1259,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
-      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
+      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-78'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-125' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu-m32.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu-m32.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu-m32.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu-m32.abi
index 1f0ae6d8..569d084b 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu-m32.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu-m32.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-intel-80386' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-intel-80386' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -98,11 +98,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-3'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-4'/>
     <type-decl name='unsigned long int' size-in-bits='32' id='type-id-5'/>
-    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='248' column='1' id='type-id-7'/>
-    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='391' column='1' id='type-id-8'/>
-    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='393' column='1' id='type-id-9'/>
-    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='394' column='1' id='type-id-10'/>
-    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='400' column='1' id='type-id-11'/>
+    <typedef-decl name='z_size_t' type-id='type-id-6' filepath='./zconf.h' line='251' column='1' id='type-id-7'/>
+    <typedef-decl name='Byte' type-id='type-id-3' filepath='./zconf.h' line='397' column='1' id='type-id-8'/>
+    <typedef-decl name='uInt' type-id='type-id-4' filepath='./zconf.h' line='399' column='1' id='type-id-9'/>
+    <typedef-decl name='uLong' type-id='type-id-5' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='Bytef' type-id='type-id-8' filepath='./zconf.h' line='406' column='1' id='type-id-11'/>
     <typedef-decl name='__int64_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='47' column='1' id='type-id-12'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-13'/>
     <typedef-decl name='__off64_t' type-id='type-id-12' filepath='/usr/include/bits/types.h' line='153' column='1' id='type-id-14'/>
@@ -137,7 +137,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='405' column='1' id='type-id-19'/>
+    <typedef-decl name='uLongf' type-id='type-id-10' filepath='./zconf.h' line='411' column='1' id='type-id-19'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='32' id='type-id-20'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='compress2'>
       <parameter type-id='type-id-21' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -160,50 +160,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='429' column='1' id='type-id-23'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-4' filepath='./zconf.h' line='435' column='1' id='type-id-23'/>
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='32' id='type-id-25'/>
     <qualified-type-def type-id='type-id-23' const='yes' id='type-id-26'/>
     <pointer-type-def type-id='type-id-26' size-in-bits='32' id='type-id-27'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-27'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-7' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-5' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-25' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-9' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-16' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-15' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-10' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-10' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-10' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
@@ -231,8 +231,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-43'/>
     </array-type-def>
     <type-decl name='void' id='type-id-44'/>
-    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='402' column='1' id='type-id-45'/>
-    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='409' column='1' id='type-id-47'/>
+    <typedef-decl name='charf' type-id='type-id-28' filepath='./zconf.h' line='408' column='1' id='type-id-45'/>
+    <typedef-decl name='voidpf' type-id='type-id-46' filepath='./zconf.h' line='415' column='1' id='type-id-47'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-48' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -581,92 +581,92 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-46'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-22' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-22' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-86' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-83' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-22' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-22' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-22' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-22' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-22' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-22' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-10' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -695,13 +695,13 @@
       <parameter type-id='type-id-22'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-47'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='32'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='type-id-47'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-44'/>
@@ -837,7 +837,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='410' column='1' id='type-id-93'/>
+    <typedef-decl name='voidp' type-id='type-id-46' filepath='./zconf.h' line='416' column='1' id='type-id-93'/>
     <typedef-decl name='__ssize_t' type-id='type-id-22' filepath='/usr/include/bits/types.h' line='194' column='1' id='type-id-94'/>
     <typedef-decl name='ssize_t' type-id='type-id-94' filepath='/usr/include/sys/types.h' line='108' column='1' id='type-id-95'/>
     <class-decl name='gz_state' size-in-bits='1248' is-struct='yes' naming-typedef-id='type-id-96' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-97'>
@@ -930,45 +930,45 @@
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-4' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-93' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-7' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-7' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-7'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-22' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-70' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-22' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-70'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-89' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='32' path='src.d/gzwrite.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='408' column='1' id='type-id-100'/>
+    <typedef-decl name='voidpc' type-id='type-id-46' filepath='./zconf.h' line='414' column='1' id='type-id-100'/>
     <typedef-decl name='__gnuc_va_list' type-id='type-id-70' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='40' column='1' id='type-id-101'/>
     <typedef-decl name='va_list' type-id='type-id-101' filepath='/usr/lib/gcc/x86_64-linux-gnu/11/include/stdarg.h' line='99' column='1' id='type-id-102'/>
     <function-decl name='vsnprintf' filepath='/usr/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1075,16 +1075,16 @@
       <parameter type-id='type-id-22' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-109' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-111' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-109' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-46' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-111' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-46' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1127,80 +1127,80 @@
       <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-22' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-80' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-22' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-22' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-22' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-22' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-21' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-85' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-18' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-9' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-61' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-59' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-59' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-22' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-22' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-22'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-59' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -1254,8 +1254,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-10'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
-      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='32' elf-symbol-id='zError'>
+      <parameter type-id='type-id-22' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-80'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-127' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu.abi b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu.abi
similarity index 92%
rename from test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu.abi
rename to test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu.abi
index bae68adb..b2a63a4b 100644
--- a/test/abi/zlib-ec3df00224d4b396e2ac6586ab5d25f673caa4c2-x86_64-pc-linux-gnu.abi
+++ b/test/abi/zlib-04f42ceca40f73e2978b50e93806c2a18c1281fc-x86_64-pc-linux-gnu.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.0' path='btmp1/libz.so.1.2.12.1-motley' architecture='elf-amd-x86_64' soname='libz.so.1'>
+<abi-corpus version='2.0' path='btmp1/libz.so.1.2.13' architecture='elf-amd-x86_64' soname='libz.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
@@ -97,11 +97,11 @@
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-2'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-3'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
-    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='248' column='1' id='type-id-6'/>
-    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='391' column='1' id='type-id-7'/>
-    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='393' column='1' id='type-id-8'/>
-    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='394' column='1' id='type-id-9'/>
-    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='400' column='1' id='type-id-10'/>
+    <typedef-decl name='z_size_t' type-id='type-id-5' filepath='./zconf.h' line='251' column='1' id='type-id-6'/>
+    <typedef-decl name='Byte' type-id='type-id-2' filepath='./zconf.h' line='397' column='1' id='type-id-7'/>
+    <typedef-decl name='uInt' type-id='type-id-3' filepath='./zconf.h' line='399' column='1' id='type-id-8'/>
+    <typedef-decl name='uLong' type-id='type-id-4' filepath='./zconf.h' line='400' column='1' id='type-id-9'/>
+    <typedef-decl name='Bytef' type-id='type-id-7' filepath='./zconf.h' line='406' column='1' id='type-id-10'/>
     <typedef-decl name='__off_t' type-id='type-id-1' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='152' column='1' id='type-id-11'/>
     <typedef-decl name='__off64_t' type-id='type-id-1' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='153' column='1' id='type-id-12'/>
     <typedef-decl name='off_t' type-id='type-id-11' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='85' column='1' id='type-id-13'/>
@@ -135,7 +135,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/compress.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='405' column='1' id='type-id-17'/>
+    <typedef-decl name='uLongf' type-id='type-id-9' filepath='./zconf.h' line='411' column='1' id='type-id-17'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-18'/>
     <function-decl name='compress2' mangled-name='compress2' filepath='src.d/compress.c' line='22' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='compress2'>
       <parameter type-id='type-id-19' name='dest' filepath='src.d/compress.c' line='23' column='1'/>
@@ -158,50 +158,50 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/crc32.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='429' column='1' id='type-id-21'/>
+    <typedef-decl name='z_crc_t' type-id='type-id-3' filepath='./zconf.h' line='435' column='1' id='type-id-21'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-22'/>
     <pointer-type-def type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
     <qualified-type-def type-id='type-id-21' const='yes' id='type-id-24'/>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-25'/>
-    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
+    <function-decl name='get_crc_table' mangled-name='get_crc_table' filepath='src.d/crc32.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_crc_table'>
       <return type-id='type-id-25'/>
     </function-decl>
-    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='740' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='741' column='1'/>
-      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='742' column='1'/>
+    <function-decl name='crc32_z' mangled-name='crc32_z' filepath='src.d/crc32.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_z@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='749' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='750' column='1'/>
+      <parameter type-id='type-id-6' name='len' filepath='src.d/crc32.c' line='751' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
-      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1064' column='1'/>
-      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1065' column='1'/>
-      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1066' column='1'/>
+    <function-decl name='crc32' mangled-name='crc32' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32'>
+      <parameter type-id='type-id-4' name='crc' filepath='src.d/crc32.c' line='1073' column='1'/>
+      <parameter type-id='type-id-23' name='buf' filepath='src.d/crc32.c' line='1074' column='1'/>
+      <parameter type-id='type-id-8' name='len' filepath='src.d/crc32.c' line='1075' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1073' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1074' column='1'/>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1075' column='1'/>
+    <function-decl name='crc32_combine64' mangled-name='crc32_combine64' filepath='src.d/crc32.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine64@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1082' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1083' column='1'/>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1084' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1085' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1086' column='1'/>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1087' column='1'/>
+    <function-decl name='crc32_combine' mangled-name='crc32_combine' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1094' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1095' column='1'/>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1096' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1094' column='1'/>
+    <function-decl name='crc32_combine_gen64' mangled-name='crc32_combine_gen64' filepath='src.d/crc32.c' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen64@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-14' name='len2' filepath='src.d/crc32.c' line='1103' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1104' column='1'/>
+    <function-decl name='crc32_combine_gen' mangled-name='crc32_combine_gen' filepath='src.d/crc32.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_gen@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-13' name='len2' filepath='src.d/crc32.c' line='1113' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
-      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1111' column='1'/>
-      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1112' column='1'/>
-      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1113' column='1'/>
+    <function-decl name='crc32_combine_op' mangled-name='crc32_combine_op' filepath='src.d/crc32.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crc32_combine_op@@ZLIB_1.2.12'>
+      <parameter type-id='type-id-9' name='crc1' filepath='src.d/crc32.c' line='1120' column='1'/>
+      <parameter type-id='type-id-9' name='crc2' filepath='src.d/crc32.c' line='1121' column='1'/>
+      <parameter type-id='type-id-9' name='op' filepath='src.d/crc32.c' line='1122' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
@@ -229,8 +229,8 @@
       <subrange length='16' type-id='type-id-4' id='type-id-41'/>
     </array-type-def>
     <type-decl name='void' id='type-id-42'/>
-    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='402' column='1' id='type-id-43'/>
-    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='409' column='1' id='type-id-45'/>
+    <typedef-decl name='charf' type-id='type-id-26' filepath='./zconf.h' line='408' column='1' id='type-id-43'/>
+    <typedef-decl name='voidpf' type-id='type-id-44' filepath='./zconf.h' line='415' column='1' id='type-id-45'/>
     <class-decl name='ct_data_s' size-in-bits='32' is-struct='yes' visibility='default' filepath='src.d/deflate.h' line='68' column='1' id='type-id-28'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='fc' type-id='type-id-46' visibility='default' filepath='src.d/deflate.h' line='72' column='1'/>
@@ -579,92 +579,92 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-44'/>
     </function-decl>
-    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='232' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='233' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='234' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='235' column='1'/>
+    <function-decl name='deflateInit_' mangled-name='deflateInit_' filepath='src.d/deflate.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='226' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='227' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='228' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='229' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='245' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='246' column='1'/>
-      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='247' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='248' column='1'/>
-      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='251' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='252' column='1'/>
+    <function-decl name='deflateInit2_' mangled-name='deflateInit2_' filepath='src.d/deflate.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='239' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='240' column='1'/>
+      <parameter type-id='type-id-20' name='method' filepath='src.d/deflate.c' line='241' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/deflate.c' line='242' column='1'/>
+      <parameter type-id='type-id-20' name='memLevel' filepath='src.d/deflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/deflate.c' line='245' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/deflate.c' line='246' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='417' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='418' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='419' column='1'/>
+    <function-decl name='deflateSetDictionary' mangled-name='deflateSetDictionary' filepath='src.d/deflate.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='413' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/deflate.c' line='414' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/deflate.c' line='415' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='486' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='487' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='488' column='1'/>
+    <function-decl name='deflateGetDictionary' mangled-name='deflateGetDictionary' filepath='src.d/deflate.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateGetDictionary@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='482' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/deflate.c' line='483' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/deflate.c' line='484' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='508' column='1'/>
+    <function-decl name='deflateResetKeep' mangled-name='deflateResetKeep' filepath='src.d/deflate.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateResetKeep@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='504' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='546' column='1'/>
+    <function-decl name='deflateReset' mangled-name='deflateReset' filepath='src.d/deflate.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateReset'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='542' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='558' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='559' column='1'/>
+    <function-decl name='deflateSetHeader' mangled-name='deflateSetHeader' filepath='src.d/deflate.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateSetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='554' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/deflate.c' line='555' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='571' column='1'/>
-      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='569' column='1'/>
-      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='570' column='1'/>
+    <function-decl name='deflatePending' mangled-name='deflatePending' filepath='src.d/deflate.c' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePending@@ZLIB_1.2.5.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='567' column='1'/>
+      <parameter type-id='type-id-84' name='pending' filepath='src.d/deflate.c' line='565' column='1'/>
+      <parameter type-id='type-id-81' name='bits' filepath='src.d/deflate.c' line='566' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='583' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='584' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='585' column='1'/>
+    <function-decl name='deflatePrime' mangled-name='deflatePrime' filepath='src.d/deflate.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflatePrime@@ZLIB_1.2.0.8'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='579' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/deflate.c' line='580' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/deflate.c' line='581' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='610' column='1'/>
-      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='611' column='1'/>
-      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='612' column='1'/>
+    <function-decl name='deflateParams' mangled-name='deflateParams' filepath='src.d/deflate.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateParams'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='606' column='1'/>
+      <parameter type-id='type-id-20' name='level' filepath='src.d/deflate.c' line='607' column='1'/>
+      <parameter type-id='type-id-20' name='strategy' filepath='src.d/deflate.c' line='608' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='659' column='1'/>
-      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='660' column='1'/>
-      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='661' column='1'/>
-      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='662' column='1'/>
-      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='663' column='1'/>
+    <function-decl name='deflateTune' mangled-name='deflateTune' filepath='src.d/deflate.c' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateTune@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='655' column='1'/>
+      <parameter type-id='type-id-20' name='good_length' filepath='src.d/deflate.c' line='656' column='1'/>
+      <parameter type-id='type-id-20' name='max_lazy' filepath='src.d/deflate.c' line='657' column='1'/>
+      <parameter type-id='type-id-20' name='nice_length' filepath='src.d/deflate.c' line='658' column='1'/>
+      <parameter type-id='type-id-20' name='max_chain' filepath='src.d/deflate.c' line='659' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='694' column='1'/>
-      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='695' column='1'/>
+    <function-decl name='deflateBound' mangled-name='deflateBound' filepath='src.d/deflate.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateBound@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='697' column='1'/>
+      <parameter type-id='type-id-9' name='sourceLen' filepath='src.d/deflate.c' line='698' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='805' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='806' column='1'/>
+    <function-decl name='deflate' mangled-name='deflate' filepath='src.d/deflate.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='816' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/deflate.c' line='817' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1120' column='1'/>
+    <function-decl name='deflateEnd' mangled-name='deflateEnd' filepath='src.d/deflate.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/deflate.c' line='1131' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1146' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1147' column='1'/>
+    <function-decl name='deflateCopy' mangled-name='deflateCopy' filepath='src.d/deflate.c' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='deflateCopy'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/deflate.c' line='1157' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/deflate.c' line='1158' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='_tr_init' filepath='src.d/deflate.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -693,13 +693,13 @@
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcalloc' filepath='src.d/zutil.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-45'/>
     </function-decl>
-    <function-decl name='zcfree' filepath='src.d/zutil.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='zcfree' filepath='src.d/zutil.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-42'/>
@@ -835,7 +835,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src.d/gzread.c' comp-dir-path='/mnt/c/build/git/zlib-ng/btmp1' language='LANG_C11'>
-    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='410' column='1' id='type-id-91'/>
+    <typedef-decl name='voidp' type-id='type-id-44' filepath='./zconf.h' line='416' column='1' id='type-id-91'/>
     <typedef-decl name='__ssize_t' type-id='type-id-1' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='194' column='1' id='type-id-92'/>
     <typedef-decl name='ssize_t' type-id='type-id-92' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='108' column='1' id='type-id-93'/>
     <class-decl name='gz_state' size-in-bits='1920' is-struct='yes' naming-typedef-id='type-id-94' visibility='default' filepath='src.d/gzguts.h' line='170' column='1' id='type-id-95'>
@@ -935,40 +935,40 @@
       <parameter type-id='type-id-78'/>
       <return type-id='type-id-42'/>
     </function-decl>
-    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='376' column='1'/>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='377' column='1'/>
-      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='378' column='1'/>
+    <function-decl name='gzread' mangled-name='gzread' filepath='src.d/gzread.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzread'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='374' column='1'/>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='375' column='1'/>
+      <parameter type-id='type-id-3' name='len' filepath='src.d/gzread.c' line='376' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='412' column='1'/>
-      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='413' column='1'/>
-      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='414' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='415' column='1'/>
+    <function-decl name='gzfread' mangled-name='gzfread' filepath='src.d/gzread.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzfread@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-91' name='buf' filepath='src.d/gzread.c' line='410' column='1'/>
+      <parameter type-id='type-id-6' name='size' filepath='src.d/gzread.c' line='411' column='1'/>
+      <parameter type-id='type-id-6' name='nitems' filepath='src.d/gzread.c' line='412' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='413' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='448' column='1'/>
+    <function-decl name='gzgetc' mangled-name='gzgetc' filepath='src.d/gzread.c' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='446' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='475' column='1'/>
+    <function-decl name='gzgetc_' mangled-name='gzgetc_' filepath='src.d/gzread.c' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgetc_@@ZLIB_1.2.5.2'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='473' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
-      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='482' column='1'/>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='483' column='1'/>
+    <function-decl name='gzungetc' mangled-name='gzungetc' filepath='src.d/gzread.c' line='479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzungetc@@ZLIB_1.2.0.2'>
+      <parameter type-id='type-id-20' name='c' filepath='src.d/gzread.c' line='480' column='1'/>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='481' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='542' column='1'/>
-      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='543' column='1'/>
-      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='544' column='1'/>
+    <function-decl name='gzgets' mangled-name='gzgets' filepath='src.d/gzread.c' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzgets'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='540' column='1'/>
+      <parameter type-id='type-id-68' name='buf' filepath='src.d/gzread.c' line='541' column='1'/>
+      <parameter type-id='type-id-20' name='len' filepath='src.d/gzread.c' line='542' column='1'/>
       <return type-id='type-id-68'/>
     </function-decl>
-    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
-      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='606' column='1'/>
+    <function-decl name='gzdirect' mangled-name='gzdirect' filepath='src.d/gzread.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gzdirect@@ZLIB_1.2.2.3'>
+      <parameter type-id='type-id-87' name='file' filepath='src.d/gzread.c' line='604' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
   </abi-instr>
@@ -987,7 +987,7 @@
         <var-decl name='reg_save_area' type-id='type-id-44' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='408' column='1' id='type-id-99'/>
+    <typedef-decl name='voidpc' type-id='type-id-44' filepath='./zconf.h' line='414' column='1' id='type-id-99'/>
     <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-100'/>
     <function-decl name='vsnprintf' filepath='/usr/include/stdio.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-68'/>
@@ -1093,16 +1093,16 @@
       <parameter type-id='type-id-20' name='stream_size' filepath='src.d/infback.c' line='33' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='251' column='1'/>
-      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='252' column='1'/>
-      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='253' column='1'/>
-      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='254' column='1'/>
-      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='255' column='1'/>
+    <function-decl name='inflateBack' mangled-name='inflateBack' filepath='src.d/infback.c' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBack@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='252' column='1'/>
+      <parameter type-id='type-id-107' name='in' filepath='src.d/infback.c' line='253' column='1'/>
+      <parameter type-id='type-id-44' name='in_desc' filepath='src.d/infback.c' line='254' column='1'/>
+      <parameter type-id='type-id-109' name='out' filepath='src.d/infback.c' line='255' column='1'/>
+      <parameter type-id='type-id-44' name='out_desc' filepath='src.d/infback.c' line='256' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='633' column='1'/>
+    <function-decl name='inflateBackEnd' mangled-name='inflateBackEnd' filepath='src.d/infback.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateBackEnd@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/infback.c' line='636' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='inflate_fast' filepath='src.d/inffast.h' line='11' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1145,80 +1145,80 @@
       <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='160' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='197' column='1'/>
-      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='198' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='199' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='200' column='1'/>
+    <function-decl name='inflateInit2_' mangled-name='inflateInit2_' filepath='src.d/inflate.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit2_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='199' column='1'/>
+      <parameter type-id='type-id-20' name='windowBits' filepath='src.d/inflate.c' line='200' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='201' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='202' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='241' column='1'/>
-      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='242' column='1'/>
-      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='243' column='1'/>
+    <function-decl name='inflateInit_' mangled-name='inflateInit_' filepath='src.d/inflate.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateInit_'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='243' column='1'/>
+      <parameter type-id='type-id-78' name='version' filepath='src.d/inflate.c' line='244' column='1'/>
+      <parameter type-id='type-id-20' name='stream_size' filepath='src.d/inflate.c' line='245' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='249' column='1'/>
-      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='250' column='1'/>
-      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='251' column='1'/>
+    <function-decl name='inflatePrime' mangled-name='inflatePrime' filepath='src.d/inflate.c' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflatePrime@@ZLIB_1.2.2.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='251' column='1'/>
+      <parameter type-id='type-id-20' name='bits' filepath='src.d/inflate.c' line='252' column='1'/>
+      <parameter type-id='type-id-20' name='value' filepath='src.d/inflate.c' line='253' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='624' column='1'/>
-      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='625' column='1'/>
+    <function-decl name='inflate' mangled-name='inflate' filepath='src.d/inflate.c' line='625' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflate'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='626' column='1'/>
+      <parameter type-id='type-id-20' name='flush' filepath='src.d/inflate.c' line='627' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1302' column='1'/>
+    <function-decl name='inflateEnd' mangled-name='inflateEnd' filepath='src.d/inflate.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateEnd'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1305' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1316' column='1'/>
-      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1317' column='1'/>
-      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1318' column='1'/>
+    <function-decl name='inflateGetDictionary' mangled-name='inflateGetDictionary' filepath='src.d/inflate.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetDictionary@@ZLIB_1.2.7.1'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1319' column='1'/>
+      <parameter type-id='type-id-19' name='dictionary' filepath='src.d/inflate.c' line='1320' column='1'/>
+      <parameter type-id='type-id-83' name='dictLength' filepath='src.d/inflate.c' line='1321' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1339' column='1'/>
-      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1340' column='1'/>
-      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1341' column='1'/>
+    <function-decl name='inflateSetDictionary' mangled-name='inflateSetDictionary' filepath='src.d/inflate.c' line='1341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSetDictionary'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1342' column='1'/>
+      <parameter type-id='type-id-16' name='dictionary' filepath='src.d/inflate.c' line='1343' column='1'/>
+      <parameter type-id='type-id-8' name='dictLength' filepath='src.d/inflate.c' line='1344' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1374' column='1'/>
-      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1375' column='1'/>
+    <function-decl name='inflateGetHeader' mangled-name='inflateGetHeader' filepath='src.d/inflate.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateGetHeader@@ZLIB_1.2.2'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1377' column='1'/>
+      <parameter type-id='type-id-59' name='head' filepath='src.d/inflate.c' line='1378' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1425' column='1'/>
+    <function-decl name='inflateSync' mangled-name='inflateSync' filepath='src.d/inflate.c' line='1427' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSync'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1428' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1483' column='1'/>
+    <function-decl name='inflateSyncPoint' mangled-name='inflateSyncPoint' filepath='src.d/inflate.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateSyncPoint'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1486' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
-      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1493' column='1'/>
-      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1494' column='1'/>
+    <function-decl name='inflateCopy' mangled-name='inflateCopy' filepath='src.d/inflate.c' line='1495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCopy@@ZLIB_1.2.0'>
+      <parameter type-id='type-id-57' name='dest' filepath='src.d/inflate.c' line='1496' column='1'/>
+      <parameter type-id='type-id-57' name='source' filepath='src.d/inflate.c' line='1497' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1540' column='1'/>
-      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1541' column='1'/>
+    <function-decl name='inflateUndermine' mangled-name='inflateUndermine' filepath='src.d/inflate.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateUndermine@@ZLIB_1.2.3.3'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1543' column='1'/>
+      <parameter type-id='type-id-20' name='subvert' filepath='src.d/inflate.c' line='1544' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1558' column='1'/>
-      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1559' column='1'/>
+    <function-decl name='inflateValidate' mangled-name='inflateValidate' filepath='src.d/inflate.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateValidate@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1561' column='1'/>
+      <parameter type-id='type-id-20' name='check' filepath='src.d/inflate.c' line='1562' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1573' column='1'/>
+    <function-decl name='inflateMark' mangled-name='inflateMark' filepath='src.d/inflate.c' line='1575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateMark@@ZLIB_1.2.3.4'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1576' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
-      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1586' column='1'/>
+    <function-decl name='inflateCodesUsed' mangled-name='inflateCodesUsed' filepath='src.d/inflate.c' line='1588' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inflateCodesUsed@@ZLIB_1.2.9'>
+      <parameter type-id='type-id-57' name='strm' filepath='src.d/inflate.c' line='1589' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
@@ -1272,8 +1272,8 @@
     <function-decl name='zlibCompileFlags' mangled-name='zlibCompileFlags' filepath='src.d/zutil.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zlibCompileFlags@@ZLIB_1.2.0.2'>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
-      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='134' column='1'/>
+    <function-decl name='zError' mangled-name='zError' filepath='src.d/zutil.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zError'>
+      <parameter type-id='type-id-20' name='err' filepath='src.d/zutil.c' line='136' column='1'/>
       <return type-id='type-id-78'/>
     </function-decl>
     <var-decl name='z_errmsg' type-id='type-id-125' visibility='default' filepath='src.d/zutil.h' line='56' column='1'/>
diff --git a/test/abicheck.sh b/test/abicheck.sh
index a759db78..96cb5072 100755
--- a/test/abicheck.sh
+++ b/test/abicheck.sh
@@ -67,9 +67,9 @@ done
 # Choose reference repo and commit
 if test "$suffix" = ""
 then
-  # Reference is zlib 1.2.12 develop due to errors compiling shared library in the 1.2.12 tag.
+  # Reference is zlib 1.2.13.
   ABI_GIT_REPO=https://github.com/madler/zlib.git
-  ABI_GIT_COMMIT=ec3df00224d4b396e2ac6586ab5d25f673caa4c2
+  ABI_GIT_COMMIT=04f42ceca40f73e2978b50e93806c2a18c1281fc
 else
   # Reference is most recent zlib-ng develop with zlib 1.2.12 compatible api.
   ABI_GIT_REPO=https://github.com/zlib-ng/zlib-ng.git
diff --git a/win32/zlib1.rc b/win32/zlib1.rc
index 82e5934c..73bc4389 100644
--- a/win32/zlib1.rc
+++ b/win32/zlib1.rc
@@ -22,7 +22,7 @@ BEGIN
       VALUE "FileDescription",	"zlib data compression library\0"
       VALUE "FileVersion",	ZLIB_VERSION "\0"
       VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright",	"(C) 1995-2022 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename",	"zlib1.dll\0"
       VALUE "ProductName",	"zlib\0"
       VALUE "ProductVersion",	ZLIB_VERSION "\0"
diff --git a/zlib.h.in b/zlib.h.in
index 96f76b2f..311cd34e 100644
--- a/zlib.h.in
+++ b/zlib.h.in
@@ -1,7 +1,7 @@
 #ifndef ZLIB_H_
 #define ZLIB_H_
 /* zlib.h -- interface of the 'zlib-ng' compression library
-   Forked from and compatible with zlib 1.2.12
+   Forked from and compatible with zlib 1.2.13
 
   Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
@@ -57,11 +57,11 @@ extern "C" {
 #define ZLIBNG_VER_STATUS 0         /* 0=devel, 1-E=beta, F=Release */
 #define ZLIBNG_VER_MODIFIED 0       /* non-zero if modified externally from zlib-ng */
 
-#define ZLIB_VERSION "1.2.12.zlib-ng"
-#define ZLIB_VERNUM 0x12cf
+#define ZLIB_VERSION "1.2.13.zlib-ng"
+#define ZLIB_VERNUM 0x12df
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 12
+#define ZLIB_VER_REVISION 13
 #define ZLIB_VER_SUBREVISION 15    /* 15=fork (0xf) */
 
 /*