From 2137b6aa997209ac3529c439f82383de0219940d Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 2 Dec 2007 16:50:20 +0000
Subject: Fixed merge accident. Next time I'm going to run the entire test
 suite ...

---
 Lib/test/test_cmd.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py
index 5aa1c40..3ed6322 100644
--- a/Lib/test/test_cmd.py
+++ b/Lib/test/test_cmd.py
@@ -8,6 +8,9 @@ Original by Michael Schneider
 from test import test_support
 import cmd
 import sys
+import trace
+import re
+from io import StringIO
 
 class samplecmdclass(cmd.Cmd):
     """
@@ -95,9 +98,9 @@ class samplecmdclass(cmd.Cmd):
     <BLANKLINE>
 
     Test for the function columnize():
-    >>> mycmd.columnize([str(i) for i in xrange(20)])
+    >>> mycmd.columnize([str(i) for i in range(20)])
     0  1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17  18  19
-    >>> mycmd.columnize([str(i) for i in xrange(20)], 10)
+    >>> mycmd.columnize([str(i) for i in range(20)], 10)
     0  7   14
     1  8   15
     2  9   16
@@ -131,18 +134,16 @@ class samplecmdclass(cmd.Cmd):
     """
 
     def preloop(self):
-        print "Hello from preloop"
+        print("Hello from preloop")
 
     def postloop(self):
-        print "Hello from postloop"
+        print("Hello from postloop")
 
     def completedefault(self, *ignored):
-        print "This is the completedefault methode"
-        return
+        print("This is the completedefault methode")
 
     def complete_command(self):
-        print "complete command"
-        return
+        print("complete command")
 
     def do_shell(self):
         pass
@@ -150,17 +151,17 @@ class samplecmdclass(cmd.Cmd):
     def do_add(self, s):
         l = s.split()
         if len(l) != 2:
-            print "*** invalid number of arguments"
+            print("*** invalid number of arguments")
             return
         try:
             l = [int(i) for i in l]
         except ValueError:
-            print "*** arguments should be numbers"
+            print("*** arguments should be numbers")
             return
-        print l[0]+l[1]
+        print(l[0]+l[1])
 
     def help_add(self):
-        print "help text for add"
+        print("help text for add")
         return
 
     def do_exit(self, arg):
@@ -170,13 +171,12 @@ def test_main(verbose=None):
     from test import test_support, test_cmd
     test_support.run_doctest(test_cmd, verbose)
 
-import trace, sys,re,StringIO
 def test_coverage(coverdir):
     tracer=trace.Trace(ignoredirs=[sys.prefix, sys.exec_prefix,],
                         trace=0, count=1)
     tracer.run('reload(cmd);test_main()')
     r=tracer.results()
-    print "Writing coverage results..."
+    print("Writing coverage results...")
     r.write_results(show_missing=True, summary=True, coverdir=coverdir)
 
 if __name__ == "__main__":
-- 
cgit v0.12

erity'>bch_coverity</option>
<option value='better_deprecation'>better_deprecation</option>
<option value='better_deprecation_85'>better_deprecation_85</option>
<option value='bg_tip_282'>bg_tip_282</option>
<option value='bsg_0d_radix_prefix'>bsg_0d_radix_prefix</option>
<option value='bug3036566'>bug3036566</option>
<option value='bug_010f4162ef'>bug_010f4162ef</option>
<option value='bug_0520d17284'>bug_0520d17284</option>
<option value='bug_05489ce335'>bug_05489ce335</option>
<option value='bug_0b874c344d'>bug_0b874c344d</option>
<option value='bug_0b874c344d_ak_info_frame_coro'>bug_0b874c344d_ak_info_frame_coro</option>
<option value='bug_0b8c387cf7'>bug_0b8c387cf7</option>
<option value='bug_0c043a175'>bug_0c043a175</option>
<option value='bug_0e4d88b650'>bug_0e4d88b650</option>
<option value='bug_0f42ff7871'>bug_0f42ff7871</option>
<option value='bug_1189293'>bug_1189293</option>
<option value='bug_1224888'>bug_1224888</option>
<option value='bug_12b0997ce7'>bug_12b0997ce7</option>
<option value='bug_13d3af3ad5'>bug_13d3af3ad5</option>
<option value='bug_13d3af3ad5_fork'>bug_13d3af3ad5_fork</option>
<option value='bug_1493a43044'>bug_1493a43044</option>
<option value='bug_1536227'>bug_1536227</option>
<option value='bug_16828b3744'>bug_16828b3744</option>
<option value='bug_1712098'>bug_1712098</option>
<option value='bug_1758a0b603'>bug_1758a0b603</option>
<option value='bug_1a25fdfec6'>bug_1a25fdfec6</option>
<option value='bug_1b0266d8bb'>bug_1b0266d8bb</option>
<option value='bug_2152292'>bug_2152292</option>
<option value='bug_219866c1e9'>bug_219866c1e9</option>
<option value='bug_2413550'>bug_2413550</option>
<option value='bug_2502002'>bug_2502002</option>
<option value='bug_25842c161f'>bug_25842c161f</option>
<option value='bug_272e866f1e'>bug_272e866f1e</option>
<option value='bug_2902268'>bug_2902268</option>
<option value='bug_2911139'>bug_2911139</option>
<option value='bug_2992970'>bug_2992970</option>
<option value='bug_2a94652ee1'>bug_2a94652ee1</option>
<option value='bug_2f7cbd01c3'>bug_2f7cbd01c3</option>
<option value='bug_2f9df4c4fa'>bug_2f9df4c4fa</option>
<option value='bug_3024359'>bug_3024359</option>
<option value='bug_3033307'>bug_3033307</option>
<option value='bug_3092089'>bug_3092089</option>
<option value='bug_3154ea2759'>bug_3154ea2759</option>
<option value='bug_31661d2135'>bug_31661d2135</option>
<option value='bug_3173086'>bug_3173086</option>
<option value='bug_3185407'>bug_3185407</option>
<option value='bug_3202171'>bug_3202171</option>
<option value='bug_3216070'>bug_3216070</option>
<option value='bug_3288345'>bug_3288345</option>
<option value='bug_3293874'>bug_3293874</option>
<option value='bug_32ae34e63a'>bug_32ae34e63a</option>
<option value='bug_3362446'>bug_3362446</option>
<option value='bug_336441ed59'>bug_336441ed59</option>
<option value='bug_3365156'>bug_3365156</option>
<option value='bug_3389764'>bug_3389764</option>
<option value='bug_3392070'>bug_3392070</option>
<option value='bug_3397515'>bug_3397515</option>
<option value='bug_3401704'>bug_3401704</option>
<option value='bug_3413857'>bug_3413857</option>
<option value='bug_3414754'>bug_3414754</option>
<option value='bug_3418547'>bug_3418547</option>
<option value='bug_3466099'>bug_3466099</option>
<option value='bug_3475569'>bug_3475569</option>
<option value='bug_3480599'>bug_3480599</option>
<option value='bug_3484402'>bug_3484402</option>
<option value='bug_3485833'>bug_3485833</option>
<option value='bug_3493120'>bug_3493120</option>
<option value='bug_3496014'>bug_3496014</option>
<option value='bug_3508771'>bug_3508771</option>
<option value='bug_3511806'>bug_3511806</option>
<option value='bug_3514475'>bug_3514475</option>
<option value='bug_3519357'>bug_3519357</option>
<option value='bug_3522560'>bug_3522560</option>
<option value='bug_3525762'>bug_3525762</option>
<option value='bug_3525907'>bug_3525907</option>
<option value='bug_3530536'>bug_3530536</option>
<option value='bug_3532959'>bug_3532959</option>
<option value='bug_3536888'>bug_3536888</option>
<option value='bug_3544685'>bug_3544685</option>
<option value='bug_3545363'>bug_3545363</option>
<option value='bug_3555001'>bug_3555001</option>
<option value='bug_3562640'>bug_3562640</option>
<option value='bug_3562640_alt'>bug_3562640_alt</option>
<option value='bug_3564735'>bug_3564735</option>
<option value='bug_3566106'>bug_3566106</option>
<option value='bug_3567063'>bug_3567063</option>
<option value='bug_3588687'>bug_3588687</option>
<option value='bug_3592747'>bug_3592747</option>
<option value='bug_3598300'>bug_3598300</option>
<option value='bug_3598580'>bug_3598580</option>
<option value='bug_3599789'>bug_3599789</option>
<option value='bug_3600057'>bug_3600057</option>
<option value='bug_3600057_85'>bug_3600057_85</option>
<option value='bug_3600058_td'>bug_3600058_td</option>
<option value='bug_3600328'>bug_3600328</option>
<option value='bug_3601260'>bug_3601260</option>
<option value='bug_3602706'>bug_3602706</option>
<option value='bug_3603434'>bug_3603434</option>
<option value='bug_3603553'>bug_3603553</option>
<option value='bug_3603695'>bug_3603695</option>
<option value='bug_3604074'>bug_3604074</option>
<option value='bug_3604576'>bug_3604576</option>
<option value='bug_3605401'>bug_3605401</option>
<option value='bug_3605447'>bug_3605447</option>
<option value='bug_3606121'>bug_3606121</option>
<option value='bug_3606683'>bug_3606683</option>
<option value='bug_3606683_84'>bug_3606683_84</option>
<option value='bug_3606683_85'>bug_3606683_85</option>
<option value='bug_3607246'>bug_3607246</option>
<option value='bug_3607372'>bug_3607372</option>
<option value='bug_3608360'>bug_3608360</option>
<option value='bug_3608714'>bug_3608714</option>
<option value='bug_3609693'>bug_3609693</option>
<option value='bug_3610026'>bug_3610026</option>
<option value='bug_3610383'>bug_3610383</option>
<option value='bug_3610404'>bug_3610404</option>
<option value='bug_3611974'>bug_3611974</option>
<option value='bug_3613609'>bug_3613609</option>
<option value='bug_3613671'>bug_3613671</option>
<option value='bug_3614342'>bug_3614342</option>
<option value='bug_39f6304c2e'>bug_39f6304c2e</option>
<option value='bug_46f801ea5a'>bug_46f801ea5a</option>
<option value='bug_473946'>bug_473946</option>
<option value='bug_47d66253c9'>bug_47d66253c9</option>
<option value='bug_4a0c163d24'>bug_4a0c163d24</option>
<option value='bug_4b61afd660'>bug_4b61afd660</option>
<option value='bug_4dbdd9af14'>bug_4dbdd9af14</option>
<option value='bug_50750c735a'>bug_50750c735a</option>
<option value='bug_510001'>bug_510001</option>
<option value='bug_547989'>bug_547989</option>
<option value='bug_57945b574a'>bug_57945b574a</option>
<option value='bug_57945b574a_without_stub'>bug_57945b574a_without_stub</option>
<option value='bug_581937ab1e'>bug_581937ab1e</option>
<option value='bug_58b96f6744'>bug_58b96f6744</option>
<option value='bug_593baa032c'>bug_593baa032c</option>
<option value='bug_5adc350683'>bug_5adc350683</option>
<option value='bug_5adc350683_86'>bug_5adc350683_86</option>
<option value='bug_5d170b5ca5'>bug_5d170b5ca5</option>
<option value='bug_5f71353740'>bug_5f71353740</option>
<option value='bug_67aa9a2070'>bug_67aa9a2070</option>
<option value='bug_6ca52aec14'>bug_6ca52aec14</option>
<option value='bug_716b427f76'>bug_716b427f76</option>
<option value='bug_734138ded8'>bug_734138ded8</option>
<option value='bug_75b8433707'>bug_75b8433707</option>
<option value='bug_7a87a9bc5b'>bug_7a87a9bc5b</option>
<option value='bug_7f02ff1efa'>bug_7f02ff1efa</option>
<option value='bug_80304238ac'>bug_80304238ac</option>
<option value='bug_85ce4bf928'>bug_85ce4bf928</option>
<option value='bug_86ceb4e2b6'>bug_86ceb4e2b6</option>
<option value='bug_879a0747be'>bug_879a0747be</option>
<option value='bug_894da183c8'>bug_894da183c8</option>
<option value='bug_8bd13f07bd'>bug_8bd13f07bd</option>
<option value='bug_900cb0284bc'>bug_900cb0284bc</option>
<option value='bug_96c3f3b47d1'>bug_96c3f3b47d1</option>
<option value='bug_97069ea11a'>bug_97069ea11a</option>
<option value='bug_9b47029467631832'>bug_9b47029467631832</option>
<option value='bug_a3309d01db'>bug_a3309d01db</option>
<option value='bug_adb198c256'>bug_adb198c256</option>
<option value='bug_af08e89777'>bug_af08e89777</option>
<option value='bug_b26e38a3e4'>bug_b26e38a3e4</option>
<option value='bug_b5ced5865b'>bug_b5ced5865b</option>
<option value='bug_b87ad7e914'>bug_b87ad7e914</option>
<option value='bug_b9b2079e6d'>bug_b9b2079e6d</option>
<option value='bug_ba44e415a0'>bug_ba44e415a0</option>
<option value='bug_bbc304f61a'>bug_bbc304f61a</option>
<option value='bug_bc1a96407a'>bug_bc1a96407a</option>
<option value='bug_bd7f17bce8'>bug_bd7f17bce8</option>
<option value='bug_bdd91c7e43'>bug_bdd91c7e43</option>
<option value='bug_c4e230f29b'>bug_c4e230f29b</option>
<option value='bug_c7d0bc9a549714e0'>bug_c7d0bc9a549714e0</option>
<option value='bug_d2ffcca163' selected='selected'>bug_d2ffcca163</option>
<option value='bug_d3071887dbc7aeac'>bug_d3071887dbc7aeac</option>
<option value='bug_d4e464ae48'>bug_d4e464ae48</option>
<option value='bug_d4e7780ca1'>bug_d4e7780ca1</option>
<option value='bug_d5ddbc7f49'>bug_d5ddbc7f49</option>
<option value='bug_db0a5f6417'>bug_db0a5f6417</option>
<option value='bug_dcc03414f5'>bug_dcc03414f5</option>
<option value='bug_dfc08326e3'>bug_dfc08326e3</option>
<option value='bug_e0a7b3e5f8'>bug_e0a7b3e5f8</option>
<option value='bug_e21fc32c2aa'>bug_e21fc32c2aa</option>
<option value='bug_e711ffb458'>bug_e711ffb458</option>
<option value='bug_f1253530cd'>bug_f1253530cd</option>
<option value='bug_f1253530cd_alt'>bug_f1253530cd_alt</option>
<option value='bug_f4f44174e'>bug_f4f44174e</option>
<option value='bug_f97d4ee020'>bug_f97d4ee020</option>
<option value='bug_f9fe90d0fa'>bug_f9fe90d0fa</option>
<option value='bug_io_32_11'>bug_io_32_11</option>
<option value='bug_itcl_1b2865'>bug_itcl_1b2865</option>
<option value='bug_unknown_no_errorcode'>bug_unknown_no_errorcode</option>
<option value='bugfix_832a1994c7_for_precompiled_bc'>bugfix_832a1994c7_for_precompiled_bc</option>
<option value='cjo_hydra'>cjo_hydra</option>
<option value='compile_ensemble'>compile_ensemble</option>
<option value='contrib_patrick_fradin_code_cleanup'>contrib_patrick_fradin_code_cleanup</option>
<option value='core_8_0_2_synthetic'>core_8_0_2_synthetic</option>
<option value='core_8_0_3_pr'>core_8_0_3_pr</option>
<option value='core_8_0_4_synthetic'>core_8_0_4_synthetic</option>
<option value='core_8_0_5_base_synthetic'>core_8_0_5_base_synthetic</option>
<option value='core_8_0_5_branch'>core_8_0_5_branch</option>
<option value='core_8_0_5_synthetic'>core_8_0_5_synthetic</option>
<option value='core_8_0_6_branch'>core_8_0_6_branch</option>
<option value='core_8_1_0_synthetic'>core_8_1_0_synthetic</option>
<option value='core_8_1_b1_synthetic'>core_8_1_b1_synthetic</option>
<option value='core_8_1_b2_synthetic'>core_8_1_b2_synthetic</option>
<option value='core_8_1_b3_synthetic'>core_8_1_b3_synthetic</option>
<option value='core_8_1_branch_old'>core_8_1_branch_old</option>
<option value='core_8_2_1_branch'>core_8_2_1_branch</option>
<option value='core_8_2_b1_synthetic'>core_8_2_b1_synthetic</option>
<option value='core_8_2_b3_branch'>core_8_2_b3_branch</option>
<option value='core_8_3_1_branch'>core_8_3_1_branch</option>
<option value='core_8_3_1_io_rewrite'>core_8_3_1_io_rewrite</option>
<option value='core_8_3_1_synthetic'>core_8_3_1_synthetic</option>
<option value='core_8_4_20_rc'>core_8_4_20_rc</option>
<option value='core_8_4_a2_synthetic'>core_8_4_a2_synthetic</option>
<option value='core_8_4_branch'>core_8_4_branch</option>
<option value='core_8_5_10_rc'>core_8_5_10_rc</option>
<option value='core_8_5_11_rc'>core_8_5_11_rc</option>
<option value='core_8_5_12_rc'>core_8_5_12_rc</option>
<option value='core_8_5_13_rc'>core_8_5_13_rc</option>
<option value='core_8_5_14rc'>core_8_5_14rc</option>
<option value='core_8_5_15_rc'>core_8_5_15_rc</option>
<option value='core_8_5_16_rc'>core_8_5_16_rc</option>
<option value='core_8_5_17_rc'>core_8_5_17_rc</option>
<option value='core_8_5_18_rc'>core_8_5_18_rc</option>
<option value='core_8_5_19_rc'>core_8_5_19_rc</option>
<option value='core_8_5_a5_synthetic'>core_8_5_a5_synthetic</option>
<option value='core_8_5_branch'>core_8_5_branch</option>
<option value='core_8_5_branch_fix_1997007'>core_8_5_branch_fix_1997007</option>
<option value='core_8_6_0_rc'>core_8_6_0_rc</option>
<option value='core_8_6_1_rc'>core_8_6_1_rc</option>
<option value='core_8_6_2_rc'>core_8_6_2_rc</option>
<option value='core_8_6_3_rc'>core_8_6_3_rc</option>
<option value='core_8_6_4_rc'>core_8_6_4_rc</option>
<option value='core_8_6_5_rc'>core_8_6_5_rc</option>
<option value='core_8_6_6_rc'>core_8_6_6_rc</option>
<option value='core_8_6_7_rc'>core_8_6_7_rc</option>
<option value='core_8_6_b2_rc'>core_8_6_b2_rc</option>
<option value='core_8_6_b3_rc'>core_8_6_b3_rc</option>
<option value='core_8_6_branch'>core_8_6_branch</option>
<option value='core_8_6_branch_fork'>core_8_6_branch_fork</option>
<option value='core_8_7_a1_rc'>core_8_7_a1_rc</option>
<option value='core_stabilizer_branch'>core_stabilizer_branch</option>
<option value='core_stabilizer_merge_synthetic'>core_stabilizer_merge_synthetic</option>
<option value='core_zip_vfs'>core_zip_vfs</option>
<option value='core_zip_vfs_c_encoder'>core_zip_vfs_c_encoder</option>
<option value='core_zip_vfs_static'>core_zip_vfs_static</option>
<option value='cpuid_on_unix'>cpuid_on_unix</option>
<option value='cygwin_environment_changes'>cygwin_environment_changes</option>
<option value='dah_proc_arg_upvar'>dah_proc_arg_upvar</option>
<option value='damkerngt_file_utime'>damkerngt_file_utime</option>
<option value='daves_chop_branch'>daves_chop_branch</option>
<option value='daves_mk_branch'>daves_mk_branch</option>
<option value='dev_8_1_stubs_branch'>dev_8_1_stubs_branch</option>
<option value='dev_hobbs_branch'>dev_hobbs_branch</option>
<option value='dev_stubs_branch'>dev_stubs_branch</option>
<option value='dgp_3401704'>dgp_3401704</option>
<option value='dgp_async_socket'>dgp_async_socket</option>
<option value='dgp_bug_find'>dgp_bug_find</option>
<option value='dgp_bye_ctx_eval_flag'>dgp_bye_ctx_eval_flag</option>
<option value='dgp_bye_location_eval_list'>dgp_bye_location_eval_list</option>
<option value='dgp_channel_flag_repair'>dgp_channel_flag_repair</option>
<option value='dgp_cmd_epoch'>dgp_cmd_epoch</option>
<option value='dgp_compile_list_shimmer'>dgp_compile_list_shimmer</option>
<option value='dgp_defer_string_rep'>dgp_defer_string_rep</option>
<option value='dgp_demo'>dgp_demo</option>
<option value='dgp_dup_encoding_fix'>dgp_dup_encoding_fix</option>
<option value='dgp_ecr'>dgp_ecr</option>
<option value='dgp_encoding_flags'>dgp_encoding_flags</option>
<option value='dgp_ensemble_rewrite'>dgp_ensemble_rewrite</option>
<option value='dgp_eof'>dgp_eof</option>
<option value='dgp_experiment'>dgp_experiment</option>
<option value='dgp_flush_channel'>dgp_flush_channel</option>
<option value='dgp_hoehrmann_decoder'>dgp_hoehrmann_decoder</option>
<option value='dgp_init_bytecode'>dgp_init_bytecode</option>
<option value='dgp_list_simplify'>dgp_list_simplify</option>
<option value='dgp_literal_reform'>dgp_literal_reform</option>
<option value='dgp_may_be_pointless'>dgp_may_be_pointless</option>
<option value='dgp_move_buffers'>dgp_move_buffers</option>
<option value='dgp_no_buffer_recycle'>dgp_no_buffer_recycle</option>
<option value='dgp_optimize_output_stage'>dgp_optimize_output_stage</option>
<option value='dgp_pkg_migration'>dgp_pkg_migration</option>
<option value='dgp_properbytearray'>dgp_properbytearray</option>
<option value='dgp_purge_NRRunObjProc'>dgp_purge_NRRunObjProc</option>
<option value='dgp_read_bytes'>dgp_read_bytes</option>
<option value='dgp_read_bytes_detour'>dgp_read_bytes_detour</option>
<option value='dgp_read_chars'>dgp_read_chars</option>
<option value='dgp_refactor'>dgp_refactor</option>
<option value='dgp_refactor_merge_synthetic'>dgp_refactor_merge_synthetic</option>
<option value='dgp_remove_string_result'>dgp_remove_string_result</option>
<option value='dgp_review'>dgp_review</option>
<option value='dgp_revise_parsedvarnametype'>dgp_revise_parsedvarnametype</option>
<option value='dgp_scan_element'>dgp_scan_element</option>
<option value='dgp_slow_read'>dgp_slow_read</option>
<option value='dgp_sprintf'>dgp_sprintf</option>
<option value='dgp_stack_depth_tester'>dgp_stack_depth_tester</option>
<option value='dgp_stackedstdchan'>dgp_stackedstdchan</option>
<option value='dgp_stop_regexp_test_crash'>dgp_stop_regexp_test_crash</option>
<option value='dgp_string_cat'>dgp_string_cat</option>
<option value='dgp_string_find'>dgp_string_find</option>
<option value='dgp_stringcat_delaystringrep'>dgp_stringcat_delaystringrep</option>
<option value='dgp_switch_compile'>dgp_switch_compile</option>
<option value='dgp_tailcall_errorinfo'>dgp_tailcall_errorinfo</option>
<option value='dgp_tailcall_errorinfo_alt'>dgp_tailcall_errorinfo_alt</option>
<option value='dgp_tcs_rewrite'>dgp_tcs_rewrite</option>
<option value='dgp_thread_leaks'>dgp_thread_leaks</option>
<option value='dgp_trunk_flag_repair'>dgp_trunk_flag_repair</option>
<option value='dgp_trunk_read'>dgp_trunk_read</option>
<option value='dgp_win_specific_strict'>dgp_win_specific_strict</option>
<option value='dgp_writebytes_optimize'>dgp_writebytes_optimize</option>
<option value='dkf_64bit_support_branch'>dkf_64bit_support_branch</option>
<option value='dkf_alias_encoding'>dkf_alias_encoding</option>
<option value='dkf_asm_crash_20131022'>dkf_asm_crash_20131022</option>
<option value='dkf_bcc_optimize'>dkf_bcc_optimize</option>
<option value='dkf_better_try_compilation'>dkf_better_try_compilation</option>
<option value='dkf_bytecode_8_6'>dkf_bytecode_8_6</option>
<option value='dkf_bytecode_8_6_eval'>dkf_bytecode_8_6_eval</option>
<option value='dkf_bytecode_8_6_join'>dkf_bytecode_8_6_join</option>
<option value='dkf_bytecode_8_6_next'>dkf_bytecode_8_6_next</option>
<option value='dkf_bytecode_8_6_string_is'>dkf_bytecode_8_6_string_is</option>
<option value='dkf_bytecode_8_6_string_replace'>dkf_bytecode_8_6_string_replace</option>
<option value='dkf_bytecode_8_6_yield'>dkf_bytecode_8_6_yield</option>
<option value='dkf_bytecode_optimizer'>dkf_bytecode_optimizer</option>
<option value='dkf_command_type'>dkf_command_type</option>
<option value='dkf_compile_improvements'>dkf_compile_improvements</option>
<option value='dkf_dict_with_compiled'>dkf_dict_with_compiled</option>
<option value='dkf_documentation_figures'>dkf_documentation_figures</option>
<option value='dkf_expose_ptrgetvar'>dkf_expose_ptrgetvar</option>
<option value='dkf_expose_ptrgetvar_8_6'>dkf_expose_ptrgetvar_8_6</option>
<option value='dkf_http_cookies'>dkf_http_cookies</option>
<option value='dkf_improved_disassembler'>dkf_improved_disassembler</option>
<option value='dkf_loop_exception_range_work'>dkf_loop_exception_range_work</option>
<option value='dkf_namespace_as_ensemble'>dkf_namespace_as_ensemble</option>
<option value='dkf_notifier_poll'>dkf_notifier_poll</option>
<option value='dkf_oo_override_definition_namespaces'>dkf_oo_override_definition_namespaces</option>
<option value='dkf_quieter_compiles'>dkf_quieter_compiles</option>
<option value='dkf_review'>dkf_review</option>
<option value='dkf_utf16_branch'>dkf_utf16_branch</option>
<option value='dkf_wait_with_poll'>dkf_wait_with_poll</option>
<option value='dogeen_assembler_branch'>dogeen_assembler_branch</option>
<option value='dogeen_assembler_merge_synthetic'>dogeen_assembler_merge_synthetic</option>
<option value='drh_micro_optimization'>drh_micro_optimization</option>
<option value='editorconfig'>editorconfig</option>
<option value='empty_bodies'>empty_bodies</option>
<option value='experiment'>experiment</option>
<option value='experimental'>experimental</option>
<option value='ferrieux_nacl'>ferrieux_nacl</option>
<option value='fix_1997007'>fix_1997007</option>
<option value='fix_42202ba1e5ff566e'>fix_42202ba1e5ff566e</option>
<option value='fix_8_5_578155d5a19b348d'>fix_8_5_578155d5a19b348d</option>
<option value='fix_win_native_access'>fix_win_native_access</option>
<option value='fix_windows_zlib'>fix_windows_zlib</option>
<option value='forgiving_pkgconfig'>forgiving_pkgconfig</option>
<option value='freq_3010352_impl'>freq_3010352_impl</option>
<option value='frq_3527238'>frq_3527238</option>
<option value='frq_3544967'>frq_3544967</option>
<option value='frq_3579001'>frq_3579001</option>
<option value='frq_3599786'>frq_3599786</option>
<option value='gahr_split_install'>gahr_split_install</option>
<option value='gahr_ticket_dee3d66bc7'>gahr_ticket_dee3d66bc7</option>
<option value='gahr_ticket_e6f27aa56f'>gahr_ticket_e6f27aa56f</option>
<option value='gahr_tip_447'>gahr_tip_447</option>
<option value='griffin_numlevels'>griffin_numlevels</option>
<option value='htmlCopyrightsFix'>htmlCopyrightsFix</option>
<option value='htmlhelpFix'>htmlhelpFix</option>
<option value='http3'>http3</option>
<option value='hypnotoad'>hypnotoad</option>
<option value='hypnotoad_bug_3598385'>hypnotoad_bug_3598385</option>
<option value='hypnotoad_prefer_native_8_6'>hypnotoad_prefer_native_8_6</option>
<option value='hypnotoad_vexpr'>hypnotoad_vexpr</option>
<option value='info_linkedname'>info_linkedname</option>
<option value='initsubsystems'>initsubsystems</option>
<option value='initsubsystems2'>initsubsystems2</option>
<option value='initsubsystems2_split'>initsubsystems2_split</option>
<option value='iocmd_leaks'>iocmd_leaks</option>
<option value='ios'>ios</option>
<option value='irontcl'>irontcl</option>
<option value='jcr_notifier_poll'>jcr_notifier_poll</option>
<option value='je_tty_cleanup'>je_tty_cleanup</option>
<option value='jenglish_termios_cleanup'>jenglish_termios_cleanup</option>
<option value='jn_0d_radix_prefix'>jn_0d_radix_prefix</option>
<option value='jn_Tcl_requirement'>jn_Tcl_requirement</option>
<option value='jn_emptystring'>jn_emptystring</option>
<option value='jn_frq_3257396'>jn_frq_3257396</option>
<option value='jn_no_struct_names'>jn_no_struct_names</option>
<option value='jn_unc_vfs'>jn_unc_vfs</option>
<option value='jn_wide_printf'>jn_wide_printf</option>
<option value='kbk_clock_encoding_ensembles'>kbk_clock_encoding_ensembles</option>
<option value='kennykb_numerics_branch'>kennykb_numerics_branch</option>
<option value='kennykb_tip_22_33'>kennykb_tip_22_33</option>
<option value='kennykb_tip_22_33_botched'>kennykb_tip_22_33_botched</option>
<option value='lanam_array_for_impl'>lanam_array_for_impl</option>
<option value='libtommath'>libtommath</option>
<option value='libtommath_1_0'>libtommath_1_0</option>
<option value='libtommath_1_0_1'>libtommath_1_0_1</option>
<option value='libtommath_tcl_fixes_75'>libtommath_tcl_fixes_75</option>
<option value='little'>little</option>
<option value='macosx_8_4_branch'>macosx_8_4_branch</option>
<option value='master'>master</option>
<option value='merge_tzdata_to_trunk'>merge_tzdata_to_trunk</option>
<option value='micro_opt'>micro_opt</option>
<option value='mig_alloc_reform'>mig_alloc_reform</option>
<option value='mig_catch_compiler'>mig_catch_compiler</option>
<option value='mig_err'>mig_err</option>
<option value='mig_no280'>mig_no280</option>
<option value='mig_nre_mods'>mig_nre_mods</option>
<option value='mig_opt2'>mig_opt2</option>
<option value='mig_opt2_tmp'>mig_opt2_tmp</option>
<option value='mig_opt_foreach'>mig_opt_foreach</option>
<option value='mig_optimize'>mig_optimize</option>
<option value='mig_review'>mig_review</option>
<option value='mig_stacklevels'>mig_stacklevels</option>
<option value='mig_strip_brutal'>mig_strip_brutal</option>
<option value='mig_tailcall_cleanup'>mig_tailcall_cleanup</option>
<option value='mig_tmp'>mig_tmp</option>
<option value='mig_tmp_optimize'>mig_tmp_optimize</option>
<option value='minimal_fix_for_3598300_problems'>minimal_fix_for_3598300_problems</option>
<option value='miniz'>miniz</option>
<option value='mistachkin_review'>mistachkin_review</option>
<option value='mistake'>mistake</option>
<option value='mistake_20110314'>mistake_20110314</option>
<option value='mistake_20110314a'>mistake_20110314a</option>
<option value='mistkae'>mistkae</option>
<option value='mod_8_3_4_branch'>mod_8_3_4_branch</option>
<option value='more_macros'>more_macros</option>
<option value='msgcat_dyn_locale'>msgcat_dyn_locale</option>
<option value='msofer_bcEngine'>msofer_bcEngine</option>
<option value='msofer_wcodes_branch'>msofer_wcodes_branch</option>
<option value='msvc_with_64bit_zlib1_dll'>msvc_with_64bit_zlib1_dll</option>
<option value='no_shimmer_string_length'>no_shimmer_string_length</option>
<option value='no_smartref'>no_smartref</option>
<option value='nonmonotonic_obj_alloc'>nonmonotonic_obj_alloc</option>
<option value='notifier'>notifier</option>
<option value='novem'>novem</option>
<option value='novem_64bit_sizes'>novem_64bit_sizes</option>
<option value='novem_ak_iframe_direct'>novem_ak_iframe_direct</option>
<option value='novem_ak_preserve_experiments'>novem_ak_preserve_experiments</option>
<option value='novem_bighash'>novem_bighash</option>
<option value='novem_bug_3598300'>novem_bug_3598300</option>
<option value='novem_demo_bug_3588687'>novem_demo_bug_3588687</option>
<option value='novem_freeifrefcountzero'>novem_freeifrefcountzero</option>
<option value='novem_more_memory_API'>novem_more_memory_API</option>
<option value='novem_no_register_objtypes'>novem_no_register_objtypes</option>
<option value='novem_no_shimmer_string_length'>novem_no_shimmer_string_length</option>
<option value='novem_no_startcmd'>novem_no_startcmd</option>
<option value='novem_numbers_eias'>novem_numbers_eias</option>
<option value='novem_purge_literals'>novem_purge_literals</option>
<option value='novem_reduced_bytecodes'>novem_reduced_bytecodes</option>
<option value='novem_reduced_symbol_export'>novem_reduced_symbol_export</option>
<option value='novem_remove_string_result'>novem_remove_string_result</option>
<option value='novem_remove_va'>novem_remove_va</option>
<option value='novem_rename_memory_API'>novem_rename_memory_API</option>
<option value='novem_review'>novem_review</option>
<option value='novem_saveresult_as_macro'>novem_saveresult_as_macro</option>
<option value='novem_support'>novem_support</option>
<option value='novem_two_layer_list'>novem_two_layer_list</option>
<option value='novem_unversioned_stub'>novem_unversioned_stub</option>
<option value='off_8_4_branch'>off_8_4_branch</option>
<option value='off_trunk'>off_trunk</option>
<option value='on_hold_84'>on_hold_84</option>
<option value='on_hold_85'>on_hold_85</option>
<option value='on_hold_trunk'>on_hold_trunk</option>
<option value='oo_copy_ns'>oo_copy_ns</option>
<option value='other_64bit_candidates'>other_64bit_candidates</option>
<option value='package_files'>package_files</option>
<option value='panic_noreturn'>panic_noreturn</option>
<option value='prevent_inline'>prevent_inline</option>
<option value='private'>private</option>
<option value='pseudotrunk_2011_03_08'>pseudotrunk_2011_03_08</option>
<option value='pyk_emptystring'>pyk_emptystring</option>
<option value='pyk_expr_numeric'>pyk_expr_numeric</option>
<option value='pyk_listdictstringrep'>pyk_listdictstringrep</option>
<option value='pyk_pkgrequirenre'>pyk_pkgrequirenre</option>
<option value='pyk_trunk'>pyk_trunk</option>
<option value='remove_pathappend_intrep'>remove_pathappend_intrep</option>
<option value='remove_trim_header'>remove_trim_header</option>
<option value='revert_3396731'>revert_3396731</option>
<option value='rfe_1711975'>rfe_1711975</option>
<option value='rfe_3216010'>rfe_3216010</option>
<option value='rfe_3389978'>rfe_3389978</option>
<option value='rfe_3432962'>rfe_3432962</option>
<option value='rfe_3464401'>rfe_3464401</option>
<option value='rfe_3473670'>rfe_3473670</option>
<option value='rfe_6c0d7aec67'>rfe_6c0d7aec67</option>
<option value='rfe_854941'>rfe_854941</option>
<option value='rfe_b42b208ba4'>rfe_b42b208ba4</option>
<option value='rfe_dfc08326e3'>rfe_dfc08326e3</option>
<option value='rfe_notifier_fork'>rfe_notifier_fork</option>
<option value='rmax_ipv6_branch'>rmax_ipv6_branch</option>
<option value='rmax_ipv6_merge_synthetic'>rmax_ipv6_merge_synthetic</option>
<option value='robust_async_connect_tests'>robust_async_connect_tests</option>
<option value='scriptics_sc_1_0_branch'>scriptics_sc_1_0_branch</option>
<option value='scriptics_sc_1_1_branch'>scriptics_sc_1_1_branch</option>
<option value='scriptics_sc_2_0_b2_synthetic'>scriptics_sc_2_0_b2_synthetic</option>
<option value='scriptics_sc_2_0_b5_synthetic'>scriptics_sc_2_0_b5_synthetic</option>
<option value='scriptics_sc_2_0_fixed_synthetic'>scriptics_sc_2_0_fixed_synthetic</option>
<option value='scriptics_tclpro_1_2'>scriptics_tclpro_1_2</option>
<option value='scriptics_tclpro_1_2_old'>scriptics_tclpro_1_2_old</option>
<option value='scriptics_tclpro_1_2_synthetic'>scriptics_tclpro_1_2_synthetic</option>
<option value='scriptics_tclpro_1_3_b2_branch'>scriptics_tclpro_1_3_b2_branch</option>
<option value='scriptics_tclpro_1_3_b3_synthetic'>scriptics_tclpro_1_3_b3_synthetic</option>
<option value='sebres_8_5_event_perf_branch'>sebres_8_5_event_perf_branch</option>
<option value='sebres_8_5_timerate'>sebres_8_5_timerate</option>
<option value='sebres_8_6_clock_speedup'>sebres_8_6_clock_speedup</option>
<option value='sebres_8_6_clock_speedup_cr1'>sebres_8_6_clock_speedup_cr1</option>
<option value='sebres_8_6_event_perf_branch'>sebres_8_6_event_perf_branch</option>
<option value='sebres_8_6_timerate'>sebres_8_6_timerate</option>
<option value='sebres_clean_core_8_5'>sebres_clean_core_8_5</option>
<option value='sebres_clock_speedup'>sebres_clock_speedup</option>
<option value='sebres_clock_tz_fix'>sebres_clock_tz_fix</option>
<option value='sebres_event_perf_fix_busy_wait'>sebres_event_perf_fix_busy_wait</option>
<option value='sebres_optimized_8_5'>sebres_optimized_8_5</option>
<option value='sebres_trunk_clock_speedup'>sebres_trunk_clock_speedup</option>
<option value='sebres_trunk_timerate'>sebres_trunk_timerate</option>
<option value='semver'>semver</option>
<option value='stwo_dev86'>stwo_dev86</option>
<option value='tclPlatformEngine'>tclPlatformEngine</option>
<option value='tcl_nosize'>tcl_nosize</option>
<option value='tclchan_assertions'>tclchan_assertions</option>
<option value='tclpro_1_5_0_synthetic'>tclpro_1_5_0_synthetic</option>
<option value='tcltest_verbose_desc'>tcltest_verbose_desc</option>
<option value='tgl_pg_re'>tgl_pg_re</option>
<option value='thread_leaks'>thread_leaks</option>
<option value='ticket_9b2e636361'>ticket_9b2e636361</option>
<option value='ticket_e770d92d6'>ticket_e770d92d6</option>
<option value='tip280_test_coverage'>tip280_test_coverage</option>
<option value='tip404_tcl8_5'>tip404_tcl8_5</option>
<option value='tip429_only_id'>tip429_only_id</option>
<option value='tip_106_impl'>tip_106_impl</option>
<option value='tip_162_branch'>tip_162_branch</option>
<option value='tip_257_implementation_branch'>tip_257_implementation_branch</option>
<option value='tip_257_implementation_branch_root_synthetic'>tip_257_implementation_branch_root_synthetic</option>
<option value='tip_257_merge1_branch_20061020T1300'>tip_257_merge1_branch_20061020T1300</option>
<option value='tip_278_branch'>tip_278_branch</option>
<option value='tip_282'>tip_282</option>
<option value='tip_302'>tip_302</option>
<option value='tip_312'>tip_312</option>
<option value='tip_318_update'>tip_318_update</option>
<option value='tip_388_impl'>tip_388_impl</option>
<option value='tip_389_impl'>tip_389_impl</option>
<option value='tip_395_with_alt_name'>tip_395_with_alt_name</option>
<option value='tip_398_impl'>tip_398_impl</option>
<option value='tip_400_impl'>tip_400_impl</option>
<option value='tip_401'>tip_401</option>
<option value='tip_404'>tip_404</option>
<option value='tip_405_impl_td'>tip_405_impl_td</option>
<option value='tip_427'>tip_427</option>
<option value='tip_428'>tip_428</option>
<option value='tip_429'>tip_429</option>
<option value='tip_436'>tip_436</option>
<option value='tip_440_alt'>tip_440_alt</option>
<option value='tip_440_backport'>tip_440_backport</option>
<option value='tip_444'>tip_444</option>
<option value='tip_445'>tip_445</option>
<option value='tip_445_fork'>tip_445_fork</option>
<option value='tip_445_reject'>tip_445_reject</option>
<option value='tip_452'>tip_452</option>
<option value='tip_456'>tip_456</option>
<option value='tip_456_fork'>tip_456_fork</option>
<option value='tip_457'>tip_457</option>
<option value='tip_458'>tip_458</option>
<option value='tip_458_experiment'>tip_458_experiment</option>
<option value='tip_463'>tip_463</option>
<option value='tip_465'>tip_465</option>
<option value='tip_468'>tip_468</option>
<option value='tip_468_bis'>tip_468_bis</option>
<option value='tip_469'>tip_469</option>
<option value='tip_470'>tip_470</option>
<option value='tip_473'>tip_473</option>
<option value='tip_59_implementation'>tip_59_implementation</option>
<option value='tip_improve_exec'>tip_improve_exec</option>
<option value='tk_bug_9eb55debc5'>tk_bug_9eb55debc5</option>
<option value='tkt3328635_posix_monotonic_clock'>tkt3328635_posix_monotonic_clock</option>
<option value='tkt_04e26c02c0'>tkt_04e26c02c0</option>
<option value='tkt_414d10346b'>tkt_414d10346b</option>
<option value='tkt_4d5ae7d88a'>tkt_4d5ae7d88a</option>
<option value='unbreak_tclcompiler'>unbreak_tclcompiler</option>
<option value='unknown_rewrite'>unknown_rewrite</option>
<option value='unproven'>unproven</option>
<option value='unsetThreadData'>unsetThreadData</option>
<option value='unwanted'>unwanted</option>
<option value='updateextended'>updateextended</option>
<option value='vc_reform'>vc_reform</option>
<option value='vs_ide_compile'>vs_ide_compile</option>
<option value='werner_utf_max_6'>werner_utf_max_6</option>
<option value='win32_arm'>win32_arm</option>
<option value='winFixes'>winFixes</option>
<option value='win_console_panic'>win_console_panic</option>
<option value='win_sock_async_connect_race_fix'>win_sock_async_connect_race_fix</option>
<option value='z_modifier'>z_modifier</option>
<option value='zipfs'>zipfs</option>
<option value='zippy_fifo'>zippy_fifo</option>
<option value='zlib_1_2_6'>zlib_1_2_6</option>
</select> <input type='submit' name='' value='switch'/></form></td></tr>
<tr><td class='sub'>Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/oss-git/tcl.git/?h=bug_d2ffcca163'>summary</a><a href='/oss-git/tcl.git/refs/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>refs</a><a href='/oss-git/tcl.git/log/?h=bug_d2ffcca163'>log</a><a href='/oss-git/tcl.git/tree/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>tree</a><a class='active' href='/oss-git/tcl.git/commit/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>commit</a><a href='/oss-git/tcl.git/diff/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>diff</a><a href='/oss-git/tcl.git/stats/?h=bug_d2ffcca163'>stats</a></td><td class='form'><form class='right' method='get' action='/oss-git/tcl.git/log/'>
<input type='hidden' name='h' value='bug_d2ffcca163'/><input type='hidden' name='id' value='cfc88759ab9d2a7118cb286943fc3074b430804b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get' action='.'><input type='hidden' name='h' value='bug_d2ffcca163'/><input type='hidden' name='id' value='cfc88759ab9d2a7118cb286943fc3074b430804b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>dkf &lt;donal.k.fellows@manchester.ac.uk&gt;</td><td class='right'>2012-05-06 17:33:19 (GMT)</td></tr>
<tr><th>committer</th><td>dkf &lt;donal.k.fellows@manchester.ac.uk&gt;</td><td class='right'>2012-05-06 17:33:19 (GMT)</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/oss-git/tcl.git/commit/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>cfc88759ab9d2a7118cb286943fc3074b430804b</a> (<a href='/oss-git/tcl.git/patch/?id=cfc88759ab9d2a7118cb286943fc3074b430804b'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/oss-git/tcl.git/tree/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>02e14967bdeaf76e67719c5ee06443dc36b3ffa3</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/oss-git/tcl.git/commit/?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>21ffddf58f04c4a455f133435b83bc79da913805</a> (<a href='/oss-git/tcl.git/diff/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b&amp;id2=21ffddf58f04c4a455f133435b83bc79da913805'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='sha1'><a href='/oss-git/tcl.git/commit/?h=bug_d2ffcca163&amp;id=14452102b5028ba9b20ceae48237a751f97f3b43'>14452102b5028ba9b20ceae48237a751f97f3b43</a> (<a href='/oss-git/tcl.git/diff/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b&amp;id2=14452102b5028ba9b20ceae48237a751f97f3b43'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/oss-git/tcl.git/snapshot/tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.zip'>tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.zip</a><br/><a href='/oss-git/tcl.git/snapshot/tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.gz'>tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.gz</a><br/><a href='/oss-git/tcl.git/snapshot/tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.bz2'>tcl-cfc88759ab9d2a7118cb286943fc3074b430804b.tar.bz2</a><br/></td></tr></table>
<div class='commit-subject'>merge trunk<span class='decoration'></span></div><div class='commit-msg'></div><div class='diffstat-header'><a href='/oss-git/tcl.git/diff/?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/ChangeLog?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>ChangeLog</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/CMakeLists.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/CMakeLists.txt</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.9%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 93.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/ChangeLog?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/ChangeLog</a></td><td class='right'>205</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.7%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 83.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/FAQ?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/FAQ</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/INDEX?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/INDEX</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/Makefile.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/Makefile.in</a></td><td class='right'>103</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 91.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/README?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/README</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/adler32.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/adler32.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.3%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/as400/bndsrc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/bndsrc</a> (renamed from compat/zlib/old/as400/bndsrc)</td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/as400/compile.clp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/compile.clp</a></td><td class='right'>110</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 9.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 91.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/as400/readme.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/readme.txt</a> (renamed from compat/zlib/old/as400/readme.txt)</td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/as400/zlib.inc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/zlib.inc</a> (renamed from compat/zlib/old/as400/zlib.inc)</td><td class='right'>154</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 87.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/compress.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/compress.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/configure?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/configure</a></td><td class='right'>500</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 29.6%;'/><td class='rem' style='width: 11.4%;'/><td class='none' style='width: 59.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/buffer_demo.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/buffer_demo.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/mtest.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/mtest.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/read.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/read.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/test.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/test.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib-streams.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-streams.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib-streams.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-streams.ads</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib-thin.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-thin.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib-thin.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-thin.ads</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib.adb</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/ada/zlib.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib.ads</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/asm586/README.586?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/asm586/README.586</a></td><td class='right'>43</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/asm586/match.S?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/asm586/match.S</a></td><td class='right'>364</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 29.9%;'/><td class='none' style='width: 70.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/asm686/match.S?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/asm686/match.S</a></td><td class='right'>16</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.2%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/delphi/ZLib.pas?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/delphi/ZLib.pas</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/delphi/zlibd32.mak?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/delphi/zlibd32.mak</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/infback9/inftree9.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/infback9/inftree9.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/iostream2/zstream.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/iostream2/zstream.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masm686/match.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masm686/match.asm</a></td><td class='right'>413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 33.9%;'/><td class='none' style='width: 66.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx64/gvmat64.obj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx64/gvmat64.obj</a></td><td class='right'>bin</td><td class='graph'>4119 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx64/inffasx64.obj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx64/inffasx64.obj</a></td><td class='right'>bin</td><td class='graph'>5913 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/gvmat32.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/gvmat32.asm</a></td><td class='right'>972</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 79.7%;'/><td class='none' style='width: 20.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/gvmat32.obj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/gvmat32.obj</a></td><td class='right'>bin</td><td class='graph'>10241 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/gvmat32c.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/gvmat32c.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.1%;'/><td class='none' style='width: 94.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/inffas32.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/inffas32.asm</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/inffas32.obj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/inffas32.obj</a></td><td class='right'>bin</td><td class='graph'>14893 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/match686.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/match686.asm</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/masmx86/mkasm.bat?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/mkasm.bat</a></td><td class='right'>3</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/ChangeLogUnzip?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/ChangeLogUnzip</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/Makefile.am?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/Makefile.am</a></td><td class='right'>45</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 96.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/configure.ac?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/configure.ac</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.6%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/ioapi.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/ioapi.c</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/ioapi.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/ioapi.h</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/miniunz.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/miniunz.c</a></td><td class='right'>38</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/minizip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/minizip.c</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 96.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/minizip.pc.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/minizip.pc.in</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/mztools.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/mztools.c</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.4%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/mztools.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/mztools.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/unzip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/unzip.c</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/minizip/zip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/zip.c</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/pascal/zlibd32.mak?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/pascal/zlibd32.mak</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/pascal/zlibpas.pas?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/pascal/zlibpas.pas</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.4%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/puff/Makefile?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/Makefile</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 96.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/puff/puff.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/puff.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.5%;'/><td class='rem' style='width: 15.2%;'/><td class='none' style='width: 79.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/puff/puff.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/puff.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/puff/pufftest.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/pufftest.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 13.5%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/puff/zeros.raw?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/zeros.raw</a></td><td class='right'>bin</td><td class='graph'>1213 -> 2517 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/readme.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/readme.txt</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.6%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.5%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc10/zlib.rc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlib.rc</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc10/zlibvc.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlibvc.def</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/miniunz.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/miniunz.vcproj</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/minizip.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/minizip.vcproj</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/testzlib.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/testzlib.vcproj</a></td><td class='right'>126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.3%;'/><td class='none' style='width: 89.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/zlib.rc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/zlib.rc</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj</a></td><td class='right'>246</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.2%;'/><td class='none' style='width: 79.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/zlibvc.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/zlibvc.def</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/zlibvc.sln?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/zlibvc.sln</a></td><td class='right'>78</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.4%;'/><td class='none' style='width: 93.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 36.5%;'/><td class='none' style='width: 63.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/miniunz.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/miniunz.vcproj</a></td><td class='right'>566</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 46.4%;'/><td class='none' style='width: 53.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/minizip.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/minizip.vcproj</a></td><td class='right'>563</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 46.2%;'/><td class='none' style='width: 53.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/testzlib.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/testzlib.vcproj</a></td><td class='right'>948</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 77.8%;'/><td class='none' style='width: 22.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 46.5%;'/><td class='none' style='width: 53.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/zlib.rc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/zlib.rc</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/zlibstat.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/zlibstat.vcproj</a></td><td class='right'>870</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 71.4%;'/><td class='none' style='width: 28.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/zlibvc.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/zlibvc.def</a></td><td class='right'>92</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.5%;'/><td class='none' style='width: 92.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/zlibvc.sln?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/zlibvc.sln</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.8%;'/><td class='none' style='width: 88.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc8/zlibvc.vcproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc8/zlibvc.vcproj</a></td><td class='right'>1219</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 100.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc9/zlib.rc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc9/zlib.rc</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/contrib/vstudio/vc9/zlibvc.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc9/zlibvc.def</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/crc32.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/crc32.c</a></td><td class='right'>85</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 2.8%;'/><td class='rem' style='width: 4.2%;'/><td class='none' style='width: 93.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/crc32.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/crc32.h</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/deflate.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/deflate.c</a></td><td class='right'>261</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 16.1%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 78.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/deflate.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/deflate.h</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/doc/algorithm.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/doc/algorithm.txt</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/gzguts.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/gzguts.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 6.1%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 92.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/gzlib.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/gzlib.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 10.2%;'/><td class='rem' style='width: 3.4%;'/><td class='none' style='width: 86.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/gzread.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/gzread.c</a></td><td class='right'>418</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 14.5%;'/><td class='rem' style='width: 19.8%;'/><td class='none' style='width: 65.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/gzwrite.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/gzwrite.c</a></td><td class='right'>146</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 7.4%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 88.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/infback.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/infback.c</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/inffixed.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/inffixed.h</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/inflate.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/inflate.c</a></td><td class='right'>90</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.3%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 92.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/inftrees.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/inftrees.c</a></td><td class='right'>46</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.9%;'/><td class='none' style='width: 96.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/make_vms.com?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/make_vms.com</a></td><td class='right'>403</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 19.1%;'/><td class='rem' style='width: 13.9%;'/><td class='none' style='width: 66.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/msdos/Makefile.bor?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/msdos/Makefile.bor</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/msdos/Makefile.msc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/msdos/Makefile.msc</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/msdos/Makefile.tc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/msdos/Makefile.tc</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/old/Makefile.emx?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/Makefile.emx</a> (renamed from compat/zlib/win32/Makefile.emx)</td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/as400/compile.clp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/as400/compile.clp</a></td><td class='right'>123</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/visualc6/README.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/visualc6/README.txt</a></td><td class='right'>73</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.0%;'/><td class='none' style='width: 94.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/visualc6/example.dsp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/visualc6/example.dsp</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.8%;'/><td class='none' style='width: 77.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/visualc6/minigzip.dsp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/visualc6/minigzip.dsp</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.8%;'/><td class='none' style='width: 77.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/visualc6/zlib.dsp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/visualc6/zlib.dsp</a></td><td class='right'>621</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 50.9%;'/><td class='none' style='width: 49.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/oss-git/tcl.git/diff/compat/zlib/old/visualc6/zlib.dsw?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/old/visualc6/zlib.dsw</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/qnx/package.qpg?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/qnx/package.qpg</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/test/example.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/test/example.c</a> (renamed from compat/zlib/example.c)</td><td class='right'>84</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 4.9%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/test/infcover.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/test/infcover.c</a></td><td class='right'>671</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 55.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 45.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='mov'><a href='/oss-git/tcl.git/diff/compat/zlib/test/minigzip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/test/minigzip.c</a> (renamed from compat/zlib/minigzip.c)</td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 15.8%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 84.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/treebuild.xml?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/treebuild.xml</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/trees.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/trees.c</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.9%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 96.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/uncompr.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/uncompr.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/win32/Makefile.bor?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/win32/Makefile.bor</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.2%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/win32/Makefile.gcc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/win32/Makefile.gcc</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.7%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 94.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/win32/Makefile.msc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/win32/Makefile.msc</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/win32/README-WIN32.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/win32/README-WIN32.txt</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/win32/zlib.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/win32/zlib.def</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zconf.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zconf.h</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zconf.h.cmakein?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zconf.h.cmakein</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zconf.h.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zconf.h.in</a></td><td class='right'>198</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 11.3%;'/><td class='rem' style='width: 4.9%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zlib.3?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zlib.3</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zlib.3.pdf?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zlib.3.pdf</a></td><td class='right'>bin</td><td class='graph'>8686 -> 8760 bytes<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zlib.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zlib.h</a></td><td class='right'>309</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 18.0%;'/><td class='rem' style='width: 7.3%;'/><td class='none' style='width: 74.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zlib.map?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zlib.map</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.8%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='add'><a href='/oss-git/tcl.git/diff/compat/zlib/zlib.pc.cmakein?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zlib.pc.cmakein</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.1%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zutil.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zutil.c</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.3%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/compat/zlib/zutil.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/zutil.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 3.2%;'/><td class='rem' style='width: 5.0%;'/><td class='none' style='width: 91.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/generic/tclIOSock.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>generic/tclIOSock.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/generic/tclStubInit.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>generic/tclStubInit.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.5%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/generic/tclTest.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>generic/tclTest.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 5.3%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/tests/ioCmd.test?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>tests/ioCmd.test</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.1%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/tests/platform.test?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>tests/platform.test</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.4%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/tests/socket.test?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>tests/socket.test</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/configure?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/configure</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/configure.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/configure.in</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/tclUnixCompat.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/tclUnixCompat.c</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.7%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/tclUnixFile.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/tclUnixFile.c</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/tclUnixPort.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/tclUnixPort.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.7%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 98.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/unix/tclUnixSock.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>unix/tclUnixSock.c</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.3%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/win/tclWinError.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>win/tclWinError.c</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/oss-git/tcl.git/diff/win/tclWinTest.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>win/tclWinTest.c</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.6%;'/><td class='none' style='width: 93.4%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>145 files changed, 4607 insertions, 11516 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/ChangeLog b/ChangeLog<br/>index 6694ad6..fc7c245 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/ChangeLog?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>ChangeLog</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/ChangeLog?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>ChangeLog</a></div><div class='hunk'>@@ -1,3 +1,25 @@</div><div class='add'>+2012-05-03  Jan Nijtmans  &lt;nijtmans@users.sf.net&gt;</div><div class='add'>+</div><div class='add'>+	* compat/zlib/*:      Upgrade to zlib 1.2.7 (pre-built dll is still 1.2.5,</div><div class='add'>+	will be upgraded as soon as the official build is available)</div><div class='add'>+</div><div class='add'>+2012-05-03  Don Porter  &lt;dgp@users.sourceforge.net&gt;</div><div class='add'>+</div><div class='add'>+	* tests/socket.test:	[Bug 3428754] Test socket-14.2 tolerate</div><div class='add'>+	[socket -async] connection that connects synchronously.</div><div class='add'>+</div><div class='add'>+	* unix/tclUnixSock.c:	[Bug 3428753] Fix [socket -async] connections</div><div class='add'>+	that manage to connect synchronously.</div><div class='add'>+</div><div class='add'>+2012-05-02  Jan Nijtmans  &lt;nijtmans@users.sf.net&gt;</div><div class='add'>+</div><div class='add'>+	* generic/configure.in:    Better detection and implementation for cpuid</div><div class='add'>+	* generic/configure:       instruction on Intel-derived processors, both</div><div class='add'>+	* generic/tclUnixCompat.c: 32-bit and 64-bit.</div><div class='add'>+	* generic/tclTest.c:       Move cpuid testcase from win-specific to generic</div><div class='add'>+	* win/tclWinTest.c:        tests, as it should work on all Intel-related</div><div class='add'>+	* tests/platform.test:     platforms now</div><div class='add'>+</div><div class='ctx'> 2012-04-30  Alexandre Ferrieux  &lt;ferrieux@users.sourceforge.net&gt;</div><div class='ctx'> </div><div class='ctx'> 	* tests/ioCmd.test: Tame deadlocks in broken refchan tests [Bug 3522560]</div><div class='head'>diff --git a/compat/zlib/CMakeLists.txt b/compat/zlib/CMakeLists.txt<br/>index a64fe0b..7ee3bc4 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/CMakeLists.txt?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/CMakeLists.txt</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/CMakeLists.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/CMakeLists.txt</a></div><div class='hunk'>@@ -3,9 +3,13 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)</div><div class='ctx'> </div><div class='ctx'> project(zlib C)</div><div class='ctx'> </div><div class='del'>-if(NOT DEFINED BUILD_SHARED_LIBS)</div><div class='del'>-    option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)</div><div class='del'>-endif()</div><div class='add'>+set(VERSION "1.2.7")</div><div class='add'>+</div><div class='add'>+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")</div><div class='add'>+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")</div><div class='add'>+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")</div><div class='add'>+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")</div><div class='add'>+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")</div><div class='ctx'> </div><div class='ctx'> include(CheckTypeSize)</div><div class='ctx'> include(CheckFunctionExists)</div><div class='hunk'>@@ -56,23 +60,27 @@ if(MSVC)</div><div class='ctx'>     set(CMAKE_DEBUG_POSTFIX "d")</div><div class='ctx'>     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)</div><div class='ctx'>     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)</div><div class='add'>+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)</div><div class='ctx'>     # If we're doing an out of source build and the user has a zconf.h</div><div class='ctx'>     # in their source tree...</div><div class='ctx'>     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)</div><div class='del'>-        message(FATAL_ERROR</div><div class='del'>-            "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "</div><div class='del'>-            "from the source tree.  This file is included with zlib "</div><div class='del'>-            "but CMake generates this file for you automatically "</div><div class='del'>-            "in the build directory.")</div><div class='add'>+        message(STATUS "Renaming")</div><div class='add'>+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")</div><div class='add'>+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")</div><div class='add'>+        message(STATUS "but CMake generates it automatically in the build directory.")</div><div class='add'>+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)</div><div class='ctx'>   endif()</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='del'>-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein</div><div class='del'>-               ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)</div><div class='del'>-include_directories(${CMAKE_CURRENT_BINARY_DIR})</div><div class='add'>+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)</div><div class='add'>+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein</div><div class='add'>+		${ZLIB_PC} @ONLY)</div><div class='add'>+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein</div><div class='add'>+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)</div><div class='add'>+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> #============================================================================</div><div class='hunk'>@@ -110,18 +118,27 @@ set(ZLIB_SRCS</div><div class='ctx'>     trees.c</div><div class='ctx'>     uncompr.c</div><div class='ctx'>     zutil.c</div><div class='del'>-    win32/zlib1.rc</div><div class='ctx'> )</div><div class='ctx'> </div><div class='add'>+if(NOT MINGW)</div><div class='add'>+    set(ZLIB_SRCS ${ZLIB_SRCS}</div><div class='add'>+        win32/zlib1.rc # If present will override custom build rule below.</div><div class='add'>+    )</div><div class='add'>+endif()</div><div class='add'>+</div><div class='ctx'> # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION</div><div class='ctx'> file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)</div><div class='del'>-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([0-9A-Za-z.]+)\".*"</div><div class='add'>+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"</div><div class='ctx'>     "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})</div><div class='ctx'> </div><div class='ctx'> if(MINGW)</div><div class='ctx'>     # This gets us DLL resource information when compiling on MinGW.</div><div class='add'>+    if(NOT CMAKE_RC_COMPILER)</div><div class='add'>+        SET(CMAKE_RC_COMPILER windres.exe)</div><div class='add'>+    endif()</div><div class='add'>+</div><div class='ctx'>     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj</div><div class='del'>-                       COMMAND windres.exe</div><div class='add'>+                       COMMAND ${CMAKE_RC_COMPILER}</div><div class='ctx'>                             -D GCC_WINDRES</div><div class='ctx'>                             -I ${CMAKE_CURRENT_SOURCE_DIR}</div><div class='ctx'>                             -I ${CMAKE_CURRENT_BINARY_DIR}</div><div class='hunk'>@@ -130,9 +147,9 @@ if(MINGW)</div><div class='ctx'>     set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)</div><div class='ctx'> endif(MINGW)</div><div class='ctx'> </div><div class='del'>-add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})</div><div class='add'>+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})</div><div class='add'>+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})</div><div class='ctx'> set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)</div><div class='del'>-</div><div class='ctx'> set_target_properties(zlib PROPERTIES SOVERSION 1)</div><div class='ctx'> </div><div class='ctx'> if(NOT CYGWIN)</div><div class='hunk'>@@ -148,43 +165,47 @@ endif()</div><div class='ctx'> </div><div class='ctx'> if(UNIX)</div><div class='ctx'>     # On unix-like platforms the library is almost always called libz</div><div class='del'>-   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)</div><div class='add'>+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)</div><div class='add'>+   set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")</div><div class='ctx'> elseif(BUILD_SHARED_LIBS AND WIN32)</div><div class='ctx'>     # Creates zlib1.dll when building shared library version</div><div class='ctx'>     set_target_properties(zlib PROPERTIES SUFFIX "1.dll")</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(TARGETS zlib</div><div class='del'>-        RUNTIME DESTINATION bin</div><div class='del'>-        ARCHIVE DESTINATION lib</div><div class='del'>-        LIBRARY DESTINATION lib )</div><div class='add'>+    install(TARGETS zlib zlibstatic</div><div class='add'>+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"</div><div class='add'>+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"</div><div class='add'>+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )</div><div class='ctx'> endif()</div><div class='ctx'> if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)</div><div class='add'>+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")</div><div class='add'>+endif()</div><div class='add'>+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )</div><div class='add'>+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")</div><div class='ctx'> endif()</div><div class='ctx'> if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )</div><div class='del'>-    install(FILES zlib.3 DESTINATION share/man/man3)</div><div class='add'>+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")</div><div class='ctx'> endif()</div><div class='ctx'> </div><div class='ctx'> #============================================================================</div><div class='ctx'> # Example binaries</div><div class='ctx'> #============================================================================</div><div class='ctx'> </div><div class='del'>-add_executable(example example.c)</div><div class='add'>+add_executable(example test/example.c)</div><div class='ctx'> target_link_libraries(example zlib)</div><div class='ctx'> add_test(example example)</div><div class='ctx'> </div><div class='del'>-add_executable(minigzip minigzip.c)</div><div class='add'>+add_executable(minigzip test/minigzip.c)</div><div class='ctx'> target_link_libraries(minigzip zlib)</div><div class='ctx'> </div><div class='ctx'> if(HAVE_OFF64_T)</div><div class='del'>-    add_executable(example64 example.c)</div><div class='add'>+    add_executable(example64 test/example.c)</div><div class='ctx'>     target_link_libraries(example64 zlib)</div><div class='ctx'>     set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")</div><div class='ctx'>     add_test(example64 example64)</div><div class='ctx'> </div><div class='del'>-    add_executable(minigzip64 minigzip.c)</div><div class='add'>+    add_executable(minigzip64 test/minigzip.c)</div><div class='ctx'>     target_link_libraries(minigzip64 zlib)</div><div class='ctx'>     set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")</div><div class='ctx'> endif()</div><div class='head'>diff --git a/compat/zlib/ChangeLog b/compat/zlib/ChangeLog<br/>index fc61964..c2c643a 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/ChangeLog?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/ChangeLog</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/ChangeLog?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/ChangeLog</a></div><div class='hunk'>@@ -1,12 +1,213 @@</div><div class='ctx'> </div><div class='ctx'>                 ChangeLog file for zlib</div><div class='ctx'> </div><div class='add'>+Changes in 1.2.7 (2 May 2012)</div><div class='add'>+- Replace use of memmove() with a simple copy for portability</div><div class='add'>+- Test for existence of strerror</div><div class='add'>+- Restore gzgetc_ for backward compatibility with 1.2.6</div><div class='add'>+- Fix build with non-GNU make on Solaris</div><div class='add'>+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute</div><div class='add'>+- Include unistd.h for Watcom C</div><div class='add'>+- Use __WATCOMC__ instead of __WATCOM__</div><div class='add'>+- Do not use the visibility attribute if NO_VIZ defined</div><div class='add'>+- Improve the detection of no hidden visibility attribute</div><div class='add'>+- Avoid using __int64 for gcc or solo compilation</div><div class='add'>+- Cast to char * in gzprintf to avoid warnings [Zinser]</div><div class='add'>+- Fix make_vms.com for VAX [Zinser]</div><div class='add'>+- Don't use library or built-in byte swaps</div><div class='add'>+- Simplify test and use of gcc hidden attribute</div><div class='add'>+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory</div><div class='add'>+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()</div><div class='add'>+- Fix bug in test/minigzip.c for configure --solo</div><div class='add'>+- Fix contrib/vstudio project link errors [Mohanathas]</div><div class='add'>+- Add ability to choose the builder in make_vms.com [Schweda]</div><div class='add'>+- Add DESTDIR support to mingw32 win32/Makefile.gcc</div><div class='add'>+- Fix comments in win32/Makefile.gcc for proper usage</div><div class='add'>+- Allow overriding the default install locations for cmake</div><div class='add'>+- Generate and install the pkg-config file with cmake</div><div class='add'>+- Build both a static and a shared version of zlib with cmake</div><div class='add'>+- Include version symbols for cmake builds</div><div class='add'>+- If using cmake with MSVC, add the source directory to the includes</div><div class='add'>+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc [Truta]</div><div class='add'>+- Move obsolete emx makefile to old [Truta]</div><div class='add'>+- Allow the use of -Wundef when compiling or using zlib</div><div class='add'>+- Avoid the use of the -u option with mktemp</div><div class='add'>+- Improve inflate() documentation on the use of Z_FINISH</div><div class='add'>+- Recognize clang as gcc</div><div class='add'>+- Add gzopen_w() in Windows for wide character path names</div><div class='add'>+- Rename zconf.h in CMakeLists.txt to move it out of the way</div><div class='add'>+- Add source directory in CMakeLists.txt for building examples</div><div class='add'>+- Look in build directory for zlib.pc in CMakeLists.txt</div><div class='add'>+- Remove gzflags from zlibvc.def in vc9 and vc10</div><div class='add'>+- Fix contrib/minizip compilation in the MinGW environment</div><div class='add'>+- Update ./configure for Solaris, support --64 [Mooney]</div><div class='add'>+- Remove -R. from Solaris shared build (possible security issue)</div><div class='add'>+- Avoid race condition for parallel make (-j) running example</div><div class='add'>+- Fix type mismatch between get_crc_table() and crc_table</div><div class='add'>+- Fix parsing of version with "-" in CMakeLists.txt [Snider, Ziegler]</div><div class='add'>+- Fix the path to zlib.map in CMakeLists.txt</div><div class='add'>+- Force the native libtool in Mac OS X to avoid GNU libtool [Beebe]</div><div class='add'>+- Add instructions to win32/Makefile.gcc for shared install [Torri]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.6.1 (12 Feb 2012)</div><div class='add'>+- Avoid the use of the Objective-C reserved name "id"</div><div class='add'>+- Include io.h in gzguts.h for Microsoft compilers</div><div class='add'>+- Fix problem with ./configure --prefix and gzgetc macro</div><div class='add'>+- Include gz_header definition when compiling zlib solo</div><div class='add'>+- Put gzflags() functionality back in zutil.c</div><div class='add'>+- Avoid library header include in crc32.c for Z_SOLO</div><div class='add'>+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set</div><div class='add'>+- Minor cleanup in contrib/minizip/zip.c [Vollant]</div><div class='add'>+- Update make_vms.com [Zinser]</div><div class='add'>+- Remove unnecessary gzgetc_ function</div><div class='add'>+- Use optimized byte swap operations for Microsoft and GNU [Snyder]</div><div class='add'>+- Fix minor typo in zlib.h comments [Rzesniowiecki]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.6 (29 Jan 2012)</div><div class='add'>+- Update the Pascal interface in contrib/pascal</div><div class='add'>+- Fix function numbers for gzgetc_ in zlibvc.def files</div><div class='add'>+- Fix configure.ac for contrib/minizip [Schiffer]</div><div class='add'>+- Fix large-entry detection in minizip on 64-bit systems [Schiffer]</div><div class='add'>+- Have ./configure use the compiler return code for error indication</div><div class='add'>+- Fix CMakeLists.txt for cross compilation [McClure]</div><div class='add'>+- Fix contrib/minizip/zip.c for 64-bit architectures [Dalsnes]</div><div class='add'>+- Fix compilation of contrib/minizip on FreeBSD [Marquez]</div><div class='add'>+- Correct suggested usages in win32/Makefile.msc [Shachar, Horvath]</div><div class='add'>+- Include io.h for Turbo C / Borland C on all platforms [Truta]</div><div class='add'>+- Make version explicit in contrib/minizip/configure.ac [Bosmans]</div><div class='add'>+- Avoid warning for no encryption in contrib/minizip/zip.c [Vollant]</div><div class='add'>+- Minor cleanup up contrib/minizip/unzip.c [Vollant]</div><div class='add'>+- Fix bug when compiling minizip with C++ [Vollant]</div><div class='add'>+- Protect for long name and extra fields in contrib/minizip [Vollant]</div><div class='add'>+- Avoid some warnings in contrib/minizip [Vollant]</div><div class='add'>+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip</div><div class='add'>+- Add missing libs to minizip linker command</div><div class='add'>+- Add support for VPATH builds in contrib/minizip</div><div class='add'>+- Add an --enable-demos option to contrib/minizip/configure</div><div class='add'>+- Add the generation of configure.log by ./configure</div><div class='add'>+- Exit when required parameters not provided to win32/Makefile.gcc</div><div class='add'>+- Have gzputc return the character written instead of the argument</div><div class='add'>+- Use the -m option on ldconfig for BSD systems [Tobias]</div><div class='add'>+- Correct in zlib.map when deflateResetKeep was added</div><div class='add'>+</div><div class='add'>+Changes in 1.2.5.3 (15 Jan 2012)</div><div class='add'>+- Restore gzgetc function for binary compatibility</div><div class='add'>+- Do not use _lseeki64 under Borland C++ [Truta]</div><div class='add'>+- Update win32/Makefile.msc to build test/*.c [Truta]</div><div class='add'>+- Remove old/visualc6 given CMakefile and other alternatives</div><div class='add'>+- Update AS400 build files and documentation [Monnerat]</div><div class='add'>+- Update win32/Makefile.gcc to build test/*.c [Truta]</div><div class='add'>+- Permit stronger flushes after Z_BLOCK flushes</div><div class='add'>+- Avoid extraneous empty blocks when doing empty flushes</div><div class='add'>+- Permit Z_NULL arguments to deflatePending</div><div class='add'>+- Allow deflatePrime() to insert bits in the middle of a stream</div><div class='add'>+- Remove second empty static block for Z_PARTIAL_FLUSH</div><div class='add'>+- Write out all of the available bits when using Z_BLOCK</div><div class='add'>+- Insert the first two strings in the hash table after a flush</div><div class='add'>+</div><div class='add'>+Changes in 1.2.5.2 (17 Dec 2011)</div><div class='add'>+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'</div><div class='add'>+- use relative symlinks for shared libs</div><div class='add'>+- Avoid searching past window for Z_RLE strategy</div><div class='add'>+- Assure that high-water mark initialization is always applied in deflate</div><div class='add'>+- Add assertions to fill_window() in deflate.c to match comments</div><div class='add'>+- Update python link in README</div><div class='add'>+- Correct spelling error in gzread.c</div><div class='add'>+- Fix bug in gzgets() for a concatenated empty gzip stream</div><div class='add'>+- Correct error in comment for gz_make()</div><div class='add'>+- Change gzread() and related to ignore junk after gzip streams</div><div class='add'>+- Allow gzread() and related to continue after gzclearerr()</div><div class='add'>+- Allow gzrewind() and gzseek() after a premature end-of-file</div><div class='add'>+- Simplify gzseek() now that raw after gzip is ignored</div><div class='add'>+- Change gzgetc() to a macro for speed (~40% speedup in testing)</div><div class='add'>+- Fix gzclose() to return the actual error last encountered</div><div class='add'>+- Always add large file support for windows</div><div class='add'>+- Include zconf.h for windows large file support</div><div class='add'>+- Include zconf.h.cmakein for windows large file support</div><div class='add'>+- Update zconf.h.cmakein on make distclean</div><div class='add'>+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h</div><div class='add'>+- Clarify how gzopen() appends in zlib.h comments</div><div class='add'>+- Correct documentation of gzdirect() since junk at end now ignored</div><div class='add'>+- Add a transparent write mode to gzopen() when 'T' is in the mode</div><div class='add'>+- Update python link in zlib man page</div><div class='add'>+- Get inffixed.h and MAKEFIXED result to match</div><div class='add'>+- Add a ./config --solo option to make zlib subset with no libary use</div><div class='add'>+- Add undocumented inflateResetKeep() function for CAB file decoding</div><div class='add'>+- Add --cover option to ./configure for gcc coverage testing</div><div class='add'>+- Add #define ZLIB_CONST option to use const in the z_stream interface</div><div class='add'>+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()</div><div class='add'>+- Note behavior of uncompress() to provide as much data as it can</div><div class='add'>+- Add files in contrib/minizip to aid in building libminizip</div><div class='add'>+- Split off AR options in Makefile.in and configure</div><div class='add'>+- Change ON macro to Z_ARG to avoid application conflicts</div><div class='add'>+- Facilitate compilation with Borland C++ for pragmas and vsnprintf</div><div class='add'>+- Include io.h for Turbo C / Borland C++</div><div class='add'>+- Move example.c and minigzip.c to test/</div><div class='add'>+- Simplify incomplete code table filling in inflate_table()</div><div class='add'>+- Remove code from inflate.c and infback.c that is impossible to execute</div><div class='add'>+- Test the inflate code with full coverage</div><div class='add'>+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)</div><div class='add'>+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary</div><div class='add'>+- Fix gzwrite.c to accommodate reduced memory zlib compilation</div><div class='add'>+- Have inflate() with Z_FINISH avoid the allocation of a window</div><div class='add'>+- Do not set strm-&gt;adler when doing raw inflate</div><div class='add'>+- Fix gzeof() to behave just like feof() when read is not past end of file</div><div class='add'>+- Fix bug in gzread.c when end-of-file is reached</div><div class='add'>+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF</div><div class='add'>+- Document gzread() capability to read concurrently written files</div><div class='add'>+- Remove hard-coding of resource compiler in CMakeLists.txt [Blammo]</div><div class='add'>+</div><div class='add'>+Changes in 1.2.5.1 (10 Sep 2011)</div><div class='add'>+- Update FAQ entry on shared builds (#13)</div><div class='add'>+- Avoid symbolic argument to chmod in Makefile.in</div><div class='add'>+- Fix bug and add consts in contrib/puff [Oberhumer]</div><div class='add'>+- Update contrib/puff/zeros.raw test file to have all block types</div><div class='add'>+- Add full coverage test for puff in contrib/puff/Makefile</div><div class='add'>+- Fix static-only-build install in Makefile.in</div><div class='add'>+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip [Kuno]</div><div class='add'>+- Add libz.a dependency to shared in Makefile.in for parallel builds</div><div class='add'>+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out</div><div class='add'>+- Replace $(...) with `...` in configure for non-bash sh [Bowler]</div><div class='add'>+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure [Groffen]</div><div class='add'>+- Add solaris* to Linux* in configure to allow gcc use [Groffen]</div><div class='add'>+- Add *bsd* to Linux* case in configure [Bar-Lev]</div><div class='add'>+- Add inffast.obj to dependencies in win32/Makefile.msc</div><div class='add'>+- Correct spelling error in deflate.h [Kohler]</div><div class='add'>+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc</div><div class='add'>+- Add test to configure for GNU C looking for gcc in output of $cc -v</div><div class='add'>+- Add zlib.pc generation to win32/Makefile.gcc [Weigelt]</div><div class='add'>+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not</div><div class='add'>+- Add comment in zlib.h that adler32_combine with len2 &lt; 0 makes no sense</div><div class='add'>+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)</div><div class='add'>+- Make stronger test in zconf.h to include unistd.h for LFS</div><div class='add'>+- Apply Darwin patches for 64-bit file offsets to contrib/minizip [Slack]</div><div class='add'>+- Fix zlib.h LFS support when Z_PREFIX used</div><div class='add'>+- Add updated as400 support (removed from old) [Monnerat]</div><div class='add'>+- Avoid deflate sensitivity to volatile input data</div><div class='add'>+- Avoid division in adler32_combine for NO_DIVIDE</div><div class='add'>+- Clarify the use of Z_FINISH with deflateBound() amount of space</div><div class='add'>+- Set binary for output file in puff.c</div><div class='add'>+- Use u4 type for crc_table to avoid conversion warnings</div><div class='add'>+- Apply casts in zlib.h to avoid conversion warnings</div><div class='add'>+- Add OF to prototypes for adler32_combine_ and crc32_combine_ [Miller]</div><div class='add'>+- Improve inflateSync() documentation to note indeterminancy</div><div class='add'>+- Add deflatePending() function to return the amount of pending output</div><div class='add'>+- Correct the spelling of "specification" in FAQ [Randers-Pehrson]</div><div class='add'>+- Add a check in configure for stdarg.h, use for gzprintf()</div><div class='add'>+- Check that pointers fit in ints when gzprint() compiled old style</div><div class='add'>+- Add dummy name before $(SHAREDLIBV) in Makefile [Bar-Lev, Bowler]</div><div class='add'>+- Delete line in configure that adds -L. libz.a to LDFLAGS [Weigelt]</div><div class='add'>+- Add debug records in assmebler code [Londer]</div><div class='add'>+- Update RFC references to use http://tools.ietf.org/html/... [Li]</div><div class='add'>+- Add --archs option, use of libtool to configure for Mac OS X [Borstel]</div><div class='add'>+</div><div class='ctx'> Changes in 1.2.5 (19 Apr 2010)</div><div class='ctx'> - Disable visibility attribute in win32/Makefile.gcc [Bar-Lev]</div><div class='ctx'> - Default to libdir as sharedlibdir in configure [Nieder]</div><div class='ctx'> - Update copyright dates on modified source files</div><div class='ctx'> - Update trees.c to be able to generate modified trees.h</div><div class='ctx'> - Exit configure for MinGW, suggesting win32/Makefile.gcc</div><div class='add'>+- Check for NULL path in gz_open [Homurlu]</div><div class='ctx'> </div><div class='ctx'> Changes in 1.2.4.5 (18 Apr 2010)</div><div class='ctx'> - Set sharedlibdir in configure [Torok]</div><div class='hunk'>@@ -261,7 +462,7 @@ Changes in 1.2.3.4 (21 Dec 2009)</div><div class='ctx'> - Clear bytes after deflate lookahead to avoid use of uninitialized data</div><div class='ctx'> - Change a limit in inftrees.c to be more transparent to Coverity Prevent</div><div class='ctx'> - Update win32/zlib.def with exported symbols from zlib.h</div><div class='del'>-- Correct spelling error in zlib.h [Willem]</div><div class='add'>+- Correct spelling errors in zlib.h [Willem, Sobrado]</div><div class='ctx'> - Allow Z_BLOCK for deflate() to force a new block</div><div class='ctx'> - Allow negative bits in inflatePrime() to delete existing bit buffer</div><div class='ctx'> - Add Z_TREES flush option to inflate() to return at end of trees</div><div class='hunk'>@@ -952,7 +1153,7 @@ Changes in 1.0.6 (19 Jan 1998)</div><div class='ctx'> - use _fdopen instead of fdopen for MSC &gt;= 6.0 (Thomas Fanslau)</div><div class='ctx'> - added makelcc.bat for lcc-win32 (Tom St Denis)</div><div class='ctx'> - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)</div><div class='del'>-- Avoid expanded $Id: ChangeLog,v 1.4 2010/04/20 14:50:10 nijtmans Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.</div><div class='add'>+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.</div><div class='ctx'> - check for unistd.h in configure (for off_t)</div><div class='ctx'> - remove useless check parameter in inflate_blocks_free</div><div class='ctx'> - avoid useless assignment of s-&gt;check to itself in inflate_blocks_new</div><div class='head'>diff --git a/compat/zlib/FAQ b/compat/zlib/FAQ<br/>index 1a22750..99b7cf9 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/FAQ?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/FAQ</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/FAQ?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/FAQ</a></div><div class='hunk'>@@ -44,8 +44,8 @@ The lastest zlib FAQ is at http://zlib.net/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'>  6. Where's the zlib documentation (man pages, etc.)?</div><div class='ctx'> </div><div class='del'>-    It's in zlib.h .  Examples of zlib usage are in the files example.c and</div><div class='del'>-    minigzip.c, with more in examples/ .</div><div class='add'>+    It's in zlib.h .  Examples of zlib usage are in the files test/example.c</div><div class='add'>+    and test/minigzip.c, with more in examples/ .</div><div class='ctx'> </div><div class='ctx'>  7. Why don't you use GNU autoconf or libtool or ...?</div><div class='ctx'> </div><div class='hunk'>@@ -84,8 +84,10 @@ The lastest zlib FAQ is at http://zlib.net/zlib_faq.html</div><div class='ctx'> </div><div class='ctx'> 13. How can I make a Unix shared library?</div><div class='ctx'> </div><div class='del'>-    make clean</div><div class='del'>-    ./configure -s</div><div class='add'>+    By default a shared (and a static) library is built for Unix.  So:</div><div class='add'>+</div><div class='add'>+    make distclean</div><div class='add'>+    ./configure</div><div class='ctx'>     make</div><div class='ctx'> </div><div class='ctx'> 14. How do I install a shared zlib library on Unix?</div><div class='hunk'>@@ -325,7 +327,7 @@ The lastest zlib FAQ is at http://zlib.net/zlib_faq.html</div><div class='ctx'>     correctly points to the zlib specification in RFC 1950 for the "deflate"</div><div class='ctx'>     transfer encoding, there have been reports of servers and browsers that</div><div class='ctx'>     incorrectly produce or expect raw deflate data per the deflate</div><div class='del'>-    specficiation in RFC 1951, most notably Microsoft.  So even though the</div><div class='add'>+    specification in RFC 1951, most notably Microsoft.  So even though the</div><div class='ctx'>     "deflate" transfer encoding using the zlib format would be the more</div><div class='ctx'>     efficient approach (and in fact exactly what the zlib format was designed</div><div class='ctx'>     for), using the "gzip" transfer encoding is probably more reliable due to</div><div class='head'>diff --git a/compat/zlib/INDEX b/compat/zlib/INDEX<br/>index f6c51ca..2ba0641 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/INDEX?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/INDEX</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/INDEX?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/INDEX</a></div><div class='hunk'>@@ -7,6 +7,9 @@ Makefile.in     template for Unix Makefile</div><div class='ctx'> README          guess what</div><div class='ctx'> configure       configure script for Unix</div><div class='ctx'> make_vms.com    makefile for VMS</div><div class='add'>+test/example.c  zlib usages examples for build testing</div><div class='add'>+test/minigzip.c minimal gzip-like functionality for build testing</div><div class='add'>+test/infcover.c inf*.c code coverage for build coverage testing</div><div class='ctx'> treebuild.xml   XML description of source file dependencies</div><div class='ctx'> zconf.h.cmakein zconf.h template for cmake</div><div class='ctx'> zconf.h.in      zconf.h template for configure</div><div class='hunk'>@@ -14,9 +17,11 @@ zlib.3          Man page for zlib</div><div class='ctx'> zlib.3.pdf      Man page in PDF format</div><div class='ctx'> zlib.map        Linux symbol information</div><div class='ctx'> zlib.pc.in      Template for pkg-config descriptor</div><div class='add'>+zlib.pc.cmakein zlib.pc template for cmake</div><div class='ctx'> zlib2ansi       perl script to convert source files for C++ compilation</div><div class='ctx'> </div><div class='ctx'> amiga/          makefiles for Amiga SAS C</div><div class='add'>+as400/          makefiles for AS/400</div><div class='ctx'> doc/            documentation for formats and algorithms</div><div class='ctx'> msdos/          makefiles for MSDOS</div><div class='ctx'> nintendods/     makefile for Nintendo DS</div><div class='hunk'>@@ -56,10 +61,8 @@ uncompr.c</div><div class='ctx'> zutil.c</div><div class='ctx'> zutil.h</div><div class='ctx'> </div><div class='del'>-                source files for sample programs:</div><div class='del'>-example.c</div><div class='del'>-minigzip.c</div><div class='del'>-See examples/README.examples for more</div><div class='add'>+                source files for sample programs</div><div class='add'>+See examples/README.examples</div><div class='ctx'> </div><div class='del'>-                unsupported contribution by third parties</div><div class='add'>+                unsupported contributions by third parties</div><div class='ctx'> See contrib/README.contrib</div><div class='head'>diff --git a/compat/zlib/Makefile.in b/compat/zlib/Makefile.in<br/>index 5b15bd0..241deed 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/Makefile.in?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/Makefile.in</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/Makefile.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/Makefile.in</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> # Makefile for zlib</div><div class='del'>-# Copyright (C) 1995-2010 Jean-loup Gailly.</div><div class='add'>+# Copyright (C) 1995-2011 Jean-loup Gailly.</div><div class='ctx'> # For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'> </div><div class='ctx'> # To compile and test, type:</div><div class='hunk'>@@ -32,11 +32,12 @@ CPP=$(CC) -E</div><div class='ctx'> </div><div class='ctx'> STATICLIB=libz.a</div><div class='ctx'> SHAREDLIB=libz.so</div><div class='del'>-SHAREDLIBV=libz.so.1.2.5</div><div class='add'>+SHAREDLIBV=libz.so.1.2.7</div><div class='ctx'> SHAREDLIBM=libz.so.1</div><div class='ctx'> LIBS=$(STATICLIB) $(SHAREDLIBV)</div><div class='ctx'> </div><div class='del'>-AR=ar rc</div><div class='add'>+AR=ar</div><div class='add'>+ARFLAGS=rc</div><div class='ctx'> RANLIB=ranlib</div><div class='ctx'> LDCONFIG=ldconfig</div><div class='ctx'> LDSHAREDLIBC=-lc</div><div class='hunk'>@@ -53,11 +54,13 @@ mandir = ${prefix}/share/man</div><div class='ctx'> man3dir = ${mandir}/man3</div><div class='ctx'> pkgconfigdir = ${libdir}/pkgconfig</div><div class='ctx'> </div><div class='del'>-OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \</div><div class='del'>-	gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o</div><div class='add'>+OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o</div><div class='add'>+OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o</div><div class='add'>+OBJC = $(OBJZ) $(OBJG)</div><div class='ctx'> </div><div class='del'>-PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo gzread.lo \</div><div class='del'>-	gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo</div><div class='add'>+PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo</div><div class='add'>+PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo</div><div class='add'>+PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)</div><div class='ctx'> </div><div class='ctx'> # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo</div><div class='ctx'> OBJA =</div><div class='hunk'>@@ -80,35 +83,49 @@ check: test</div><div class='ctx'> test: all teststatic testshared</div><div class='ctx'> </div><div class='ctx'> teststatic: static</div><div class='del'>-	@if echo hello world | ./minigzip | ./minigzip -d &amp;&amp; ./example; then \</div><div class='add'>+	@TMPST=`mktemp fooXXXXXX`; \</div><div class='add'>+	if echo hello world | ./minigzip | ./minigzip -d &amp;&amp; ./example $$TMPST ; then \</div><div class='ctx'> 	  echo '		*** zlib test OK ***'; \</div><div class='ctx'> 	else \</div><div class='ctx'> 	  echo '		*** zlib test FAILED ***'; false; \</div><div class='del'>-	fi</div><div class='del'>-	-@rm -f foo.gz</div><div class='add'>+	fi; \</div><div class='add'>+	rm -f $$TMPST</div><div class='ctx'> </div><div class='ctx'> testshared: shared</div><div class='ctx'> 	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \</div><div class='ctx'> 	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \</div><div class='ctx'> 	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \</div><div class='ctx'> 	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \</div><div class='del'>-	if echo hello world | ./minigzipsh | ./minigzipsh -d &amp;&amp; ./examplesh; then \</div><div class='add'>+	TMPSH=`mktemp fooXXXXXX`; \</div><div class='add'>+	if echo hello world | ./minigzipsh | ./minigzipsh -d &amp;&amp; ./examplesh $$TMPSH; then \</div><div class='ctx'> 	  echo '		*** zlib shared test OK ***'; \</div><div class='ctx'> 	else \</div><div class='ctx'> 	  echo '		*** zlib shared test FAILED ***'; false; \</div><div class='del'>-	fi</div><div class='del'>-	-@rm -f foo.gz</div><div class='add'>+	fi; \</div><div class='add'>+	rm -f $$TMPSH</div><div class='ctx'> </div><div class='ctx'> test64: all64</div><div class='del'>-	@if echo hello world | ./minigzip64 | ./minigzip64 -d &amp;&amp; ./example64; then \</div><div class='add'>+	@TMP64=`mktemp fooXXXXXX`; \</div><div class='add'>+	if echo hello world | ./minigzip64 | ./minigzip64 -d &amp;&amp; ./example64 $$TMP64; then \</div><div class='ctx'> 	  echo '		*** zlib 64-bit test OK ***'; \</div><div class='ctx'> 	else \</div><div class='ctx'> 	  echo '		*** zlib 64-bit test FAILED ***'; false; \</div><div class='del'>-	fi</div><div class='del'>-	-@rm -f foo.gz</div><div class='add'>+	fi; \</div><div class='add'>+	rm -f $$TMP64</div><div class='add'>+</div><div class='add'>+infcover.o: test/infcover.c zlib.h zconf.h</div><div class='add'>+	$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c</div><div class='add'>+</div><div class='add'>+infcover: infcover.o libz.a</div><div class='add'>+	$(CC) $(CFLAGS) -o $@ infcover.o libz.a</div><div class='add'>+</div><div class='add'>+cover: infcover</div><div class='add'>+	rm -f *.gcda</div><div class='add'>+	./infcover</div><div class='add'>+	gcov inf*.c</div><div class='ctx'> </div><div class='ctx'> libz.a: $(OBJS)</div><div class='del'>-	$(AR) $@ $(OBJS)</div><div class='add'>+	$(AR) $(ARFLAGS) $@ $(OBJS)</div><div class='ctx'> 	-@ ($(RANLIB) $@ || true) &gt;/dev/null 2&gt;&amp;1</div><div class='ctx'> </div><div class='ctx'> match.o: match.S</div><div class='hunk'>@@ -123,11 +140,17 @@ match.lo: match.S</div><div class='ctx'> 	mv _match.o match.lo</div><div class='ctx'> 	rm -f _match.s</div><div class='ctx'> </div><div class='del'>-example64.o: example.c zlib.h zconf.h</div><div class='del'>-	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ example.c</div><div class='add'>+example.o: test/example.c zlib.h zconf.h</div><div class='add'>+	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c</div><div class='add'>+</div><div class='add'>+minigzip.o: test/minigzip.c zlib.h zconf.h</div><div class='add'>+	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c</div><div class='add'>+</div><div class='add'>+example64.o: test/example.c zlib.h zconf.h</div><div class='add'>+	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c</div><div class='ctx'> </div><div class='del'>-minigzip64.o: minigzip.c zlib.h zconf.h</div><div class='del'>-	$(CC) $(CFLAGS) -D_FILE_OFFSET_BITS=64 -c -o $@ minigzip.c</div><div class='add'>+minigzip64.o: test/minigzip.c zlib.h zconf.h</div><div class='add'>+	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c</div><div class='ctx'> </div><div class='ctx'> .SUFFIXES: .lo</div><div class='ctx'> </div><div class='hunk'>@@ -136,7 +159,7 @@ minigzip64.o: minigzip.c zlib.h zconf.h</div><div class='ctx'> 	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $&lt;</div><div class='ctx'> 	-@mv objs/$*.o $@</div><div class='ctx'> </div><div class='del'>-$(SHAREDLIBV): $(PIC_OBJS)</div><div class='add'>+placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a</div><div class='ctx'> 	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)</div><div class='ctx'> 	rm -f $(SHAREDLIB) $(SHAREDLIBM)</div><div class='ctx'> 	ln -s $@ $(SHAREDLIB)</div><div class='hunk'>@@ -168,14 +191,16 @@ install-libs: $(LIBS)</div><div class='ctx'> 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi</div><div class='ctx'> 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi</div><div class='ctx'> 	cp $(STATICLIB) $(DESTDIR)$(libdir)</div><div class='del'>-	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)</div><div class='del'>-	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)</div><div class='del'>-	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) &gt;/dev/null 2&gt;&amp;1</div><div class='del'>-	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \</div><div class='del'>-	  chmod 755 $(SHAREDLIBV); \</div><div class='del'>-	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \</div><div class='del'>-	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \</div><div class='add'>+	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)</div><div class='add'>+	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) &gt;/dev/null 2&gt;&amp;1</div><div class='add'>+	-@if test -n "$(SHAREDLIBV)"; then \</div><div class='add'>+	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \</div><div class='add'>+	  echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \</div><div class='add'>+	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \</div><div class='add'>+	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \</div><div class='add'>+	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \</div><div class='add'>+	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \</div><div class='add'>+	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \</div><div class='ctx'> 	  ($(LDCONFIG) || true)  &gt;/dev/null 2&gt;&amp;1; \</div><div class='ctx'> 	fi</div><div class='ctx'> 	cp zlib.3 $(DESTDIR)$(man3dir)</div><div class='hunk'>@@ -193,7 +218,7 @@ install: install-libs</div><div class='ctx'> uninstall:</div><div class='ctx'> 	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h</div><div class='ctx'> 	cd $(DESTDIR)$(libdir); rm -f libz.a; \</div><div class='del'>-	if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \</div><div class='add'>+	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \</div><div class='ctx'> 	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \</div><div class='ctx'> 	fi</div><div class='ctx'> 	cd $(DESTDIR)$(man3dir); rm -f zlib.3</div><div class='hunk'>@@ -204,9 +229,12 @@ docs: zlib.3.pdf</div><div class='ctx'> zlib.3.pdf: zlib.3</div><div class='ctx'> 	groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf</div><div class='ctx'> </div><div class='del'>-zconf.h.in: zconf.h.cmakein</div><div class='del'>-	sed "/^#cmakedefine/D" &lt; zconf.h.cmakein &gt; zconf.h.in</div><div class='del'>-	touch -r zconf.h.cmakein zconf.h.in</div><div class='add'>+zconf.h.cmakein: zconf.h.in</div><div class='add'>+	-@ TEMPFILE=`mktemp __XXXXXX`; \</div><div class='add'>+	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" &gt;&gt; $$TEMPFILE &amp;&amp;\</div><div class='add'>+	sed -f $$TEMPFILE zconf.h.in &gt; zconf.h.cmakein &amp;&amp;\</div><div class='add'>+	touch -r zconf.h.in zconf.h.cmakein &amp;&amp;\</div><div class='add'>+	rm $$TEMPFILE</div><div class='ctx'> </div><div class='ctx'> zconf: zconf.h.in</div><div class='ctx'> 	cp -p zconf.h.in zconf.h</div><div class='hunk'>@@ -216,13 +244,16 @@ clean:</div><div class='ctx'> 	rm -f *.o *.lo *~ \</div><div class='ctx'> 	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \</div><div class='ctx'> 	   example64$(EXE) minigzip64$(EXE) \</div><div class='add'>+	   infcover \</div><div class='ctx'> 	   libz.* foo.gz so_locations \</div><div class='ctx'> 	   _match.s maketree contrib/infback9/*.o</div><div class='ctx'> 	rm -rf objs</div><div class='add'>+	rm -f *.gcda *.gcno *.gcov</div><div class='add'>+	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov</div><div class='ctx'> </div><div class='ctx'> maintainer-clean: distclean</div><div class='del'>-distclean: clean zconf docs</div><div class='del'>-	rm -f Makefile zlib.pc</div><div class='add'>+distclean: clean zconf zconf.h.cmakein docs</div><div class='add'>+	rm -f Makefile zlib.pc configure.log</div><div class='ctx'> 	-@rm -f .DS_Store</div><div class='ctx'> 	-@printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' &gt; Makefile</div><div class='ctx'> 	-@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' &gt;&gt; Makefile</div><div class='head'>diff --git a/compat/zlib/README b/compat/zlib/README<br/>index d4219bf..6f1255f 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/README?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/README</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/README?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/README</a></div><div class='hunk'>@@ -1,22 +1,22 @@</div><div class='ctx'> ZLIB DATA COMPRESSION LIBRARY</div><div class='ctx'> </div><div class='del'>-zlib 1.2.5 is a general purpose data compression library.  All the code is</div><div class='add'>+zlib 1.2.7 is a general purpose data compression library.  All the code is</div><div class='ctx'> thread safe.  The data format used by the zlib library is described by RFCs</div><div class='ctx'> (Request for Comments) 1950 to 1952 in the files</div><div class='del'>-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)</div><div class='del'>-and rfc1952.txt (gzip format).</div><div class='add'>+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and</div><div class='add'>+rfc1952 (gzip format).</div><div class='ctx'> </div><div class='ctx'> All functions of the compression library are documented in the file zlib.h</div><div class='ctx'> (volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example</div><div class='del'>-of the library is given in the file example.c which also tests that the library</div><div class='del'>-is working correctly.  Another example is given in the file minigzip.c.  The</div><div class='del'>-compression library itself is composed of all source files except example.c and</div><div class='del'>-minigzip.c.</div><div class='add'>+of the library is given in the file test/example.c which also tests that</div><div class='add'>+the library is working correctly.  Another example is given in the file</div><div class='add'>+test/minigzip.c.  The compression library itself is composed of all source</div><div class='add'>+files in the root directory.</div><div class='ctx'> </div><div class='ctx'> To compile all files and run the test program, follow the instructions given at</div><div class='ctx'> the top of Makefile.in.  In short "./configure; make test", and if that goes</div><div class='del'>-well, "make install" should work for most flavors of Unix.  For Windows, use one</div><div class='del'>-of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use</div><div class='add'>+well, "make install" should work for most flavors of Unix.  For Windows, use</div><div class='add'>+one of the special makefiles in win32/ or contrib/vstudio/ .  For VMS, use</div><div class='ctx'> make_vms.com.</div><div class='ctx'> </div><div class='ctx'> Questions about zlib should be sent to &lt;zlib@gzip.org&gt;, or to Gilles Vollant</div><div class='hunk'>@@ -31,7 +31,7 @@ Mark Nelson &lt;markn@ieee.org&gt; wrote an article about zlib for the Jan.  1997</div><div class='ctx'> issue of Dr.  Dobb's Journal; a copy of the article is available at</div><div class='ctx'> http://marknelson.us/1997/01/01/zlib-engine/ .</div><div class='ctx'> </div><div class='del'>-The changes made in version 1.2.5 are documented in the file ChangeLog.</div><div class='add'>+The changes made in version 1.2.7 are documented in the file ChangeLog.</div><div class='ctx'> </div><div class='ctx'> Unsupported third party contributions are provided in directory contrib/ .</div><div class='ctx'> </div><div class='hunk'>@@ -44,7 +44,7 @@ http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .</div><div class='ctx'> </div><div class='ctx'> A Python interface to zlib written by A.M. Kuchling &lt;amk@amk.ca&gt; is</div><div class='ctx'> available in Python 1.5 and later versions, see</div><div class='del'>-http://www.python.org/doc/lib/module-zlib.html .</div><div class='add'>+http://docs.python.org/library/zlib.html .</div><div class='ctx'> </div><div class='ctx'> zlib is built into tcl: http://wiki.tcl.tk/4610 .</div><div class='ctx'> </div><div class='hunk'>@@ -84,7 +84,7 @@ Acknowledgments:</div><div class='ctx'> </div><div class='ctx'> Copyright notice:</div><div class='ctx'> </div><div class='del'>- (C) 1995-2010 Jean-loup Gailly and Mark Adler</div><div class='add'>+ (C) 1995-2012 Jean-loup Gailly and Mark Adler</div><div class='ctx'> </div><div class='ctx'>   This software is provided 'as-is', without any express or implied</div><div class='ctx'>   warranty.  In no event will the authors be held liable for any damages</div><div class='head'>diff --git a/compat/zlib/adler32.c b/compat/zlib/adler32.c<br/>index 997020d..a868f07 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/adler32.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/adler32.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/adler32.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/adler32.c</a></div><div class='hunk'>@@ -1,17 +1,17 @@</div><div class='ctx'> /* adler32.c -- compute the Adler-32 checksum of a data stream</div><div class='del'>- * Copyright (C) 1995-2007 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2011 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* @(#) $Id: adler32.c,v 1.3 2010/04/20 14:50:10 nijtmans Exp $ */</div><div class='add'>+/* @(#) $Id$ */</div><div class='ctx'> </div><div class='ctx'> #include "zutil.h"</div><div class='ctx'> </div><div class='ctx'> #define local static</div><div class='ctx'> </div><div class='del'>-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);</div><div class='add'>+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));</div><div class='ctx'> </div><div class='del'>-#define BASE 65521UL    /* largest prime smaller than 65536 */</div><div class='add'>+#define BASE 65521      /* largest prime smaller than 65536 */</div><div class='ctx'> #define NMAX 5552</div><div class='ctx'> /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) &lt;= 2^32-1 */</div><div class='ctx'> </div><div class='hunk'>@@ -21,39 +21,44 @@ local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);</div><div class='ctx'> #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);</div><div class='ctx'> #define DO16(buf)   DO8(buf,0); DO8(buf,8);</div><div class='ctx'> </div><div class='del'>-/* use NO_DIVIDE if your processor does not do division in hardware */</div><div class='add'>+/* use NO_DIVIDE if your processor does not do division in hardware --</div><div class='add'>+   try it both ways to see which is faster */</div><div class='ctx'> #ifdef NO_DIVIDE</div><div class='del'>-#  define MOD(a) \</div><div class='add'>+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15</div><div class='add'>+   (thank you to John Reiser for pointing this out) */</div><div class='add'>+#  define CHOP(a) \</div><div class='add'>+    do { \</div><div class='add'>+        unsigned long tmp = a &gt;&gt; 16; \</div><div class='add'>+        a &amp;= 0xffffUL; \</div><div class='add'>+        a += (tmp &lt;&lt; 4) - tmp; \</div><div class='add'>+    } while (0)</div><div class='add'>+#  define MOD28(a) \</div><div class='ctx'>     do { \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 16)) a -= (BASE &lt;&lt; 16); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 15)) a -= (BASE &lt;&lt; 15); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 14)) a -= (BASE &lt;&lt; 14); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 13)) a -= (BASE &lt;&lt; 13); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 12)) a -= (BASE &lt;&lt; 12); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 11)) a -= (BASE &lt;&lt; 11); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 10)) a -= (BASE &lt;&lt; 10); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 9)) a -= (BASE &lt;&lt; 9); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 8)) a -= (BASE &lt;&lt; 8); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 7)) a -= (BASE &lt;&lt; 7); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 6)) a -= (BASE &lt;&lt; 6); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 5)) a -= (BASE &lt;&lt; 5); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 4)) a -= (BASE &lt;&lt; 4); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 3)) a -= (BASE &lt;&lt; 3); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 2)) a -= (BASE &lt;&lt; 2); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 1)) a -= (BASE &lt;&lt; 1); \</div><div class='add'>+        CHOP(a); \</div><div class='ctx'>         if (a &gt;= BASE) a -= BASE; \</div><div class='ctx'>     } while (0)</div><div class='del'>-#  define MOD4(a) \</div><div class='add'>+#  define MOD(a) \</div><div class='ctx'>     do { \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 4)) a -= (BASE &lt;&lt; 4); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 3)) a -= (BASE &lt;&lt; 3); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 2)) a -= (BASE &lt;&lt; 2); \</div><div class='del'>-        if (a &gt;= (BASE &lt;&lt; 1)) a -= (BASE &lt;&lt; 1); \</div><div class='add'>+        CHOP(a); \</div><div class='add'>+        MOD28(a); \</div><div class='add'>+    } while (0)</div><div class='add'>+#  define MOD63(a) \</div><div class='add'>+    do { /* this assumes a is not negative */ \</div><div class='add'>+        z_off64_t tmp = a &gt;&gt; 32; \</div><div class='add'>+        a &amp;= 0xffffffffL; \</div><div class='add'>+        a += (tmp &lt;&lt; 8) - (tmp &lt;&lt; 5) + tmp; \</div><div class='add'>+        tmp = a &gt;&gt; 16; \</div><div class='add'>+        a &amp;= 0xffffL; \</div><div class='add'>+        a += (tmp &lt;&lt; 4) - tmp; \</div><div class='add'>+        tmp = a &gt;&gt; 16; \</div><div class='add'>+        a &amp;= 0xffffL; \</div><div class='add'>+        a += (tmp &lt;&lt; 4) - tmp; \</div><div class='ctx'>         if (a &gt;= BASE) a -= BASE; \</div><div class='ctx'>     } while (0)</div><div class='ctx'> #else</div><div class='ctx'> #  define MOD(a) a %= BASE</div><div class='del'>-#  define MOD4(a) a %= BASE</div><div class='add'>+#  define MOD28(a) a %= BASE</div><div class='add'>+#  define MOD63(a) a %= BASE</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> /* ========================================================================= */</div><div class='hunk'>@@ -92,7 +97,7 @@ uLong ZEXPORT adler32(adler, buf, len)</div><div class='ctx'>         }</div><div class='ctx'>         if (adler &gt;= BASE)</div><div class='ctx'>             adler -= BASE;</div><div class='del'>-        MOD4(sum2);             /* only added so many BASE's */</div><div class='add'>+        MOD28(sum2);            /* only added so many BASE's */</div><div class='ctx'>         return adler | (sum2 &lt;&lt; 16);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -137,8 +142,13 @@ local uLong adler32_combine_(adler1, adler2, len2)</div><div class='ctx'>     unsigned long sum2;</div><div class='ctx'>     unsigned rem;</div><div class='ctx'> </div><div class='add'>+    /* for negative len, return invalid adler32 as a clue for debugging */</div><div class='add'>+    if (len2 &lt; 0)</div><div class='add'>+        return 0xffffffffUL;</div><div class='add'>+</div><div class='ctx'>     /* the derivation of this formula is left as an exercise for the reader */</div><div class='del'>-    rem = (unsigned)(len2 % BASE);</div><div class='add'>+    MOD63(len2);                /* assumes len2 &gt;= 0 */</div><div class='add'>+    rem = (unsigned)len2;</div><div class='ctx'>     sum1 = adler1 &amp; 0xffff;</div><div class='ctx'>     sum2 = rem * sum1;</div><div class='ctx'>     MOD(sum2);</div><div class='head'>diff --git a/compat/zlib/old/as400/bndsrc b/compat/zlib/as400/bndsrc<br/>index 9cf94bb..52cc661 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/old/as400/bndsrc?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/old/as400/bndsrc</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/as400/bndsrc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/bndsrc</a></div><div class='hunk'>@@ -129,4 +129,77 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')</div><div class='ctx'> </div><div class='ctx'>   EXPORT SYMBOL("zlibCompileFlags")</div><div class='ctx'> </div><div class='add'>+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/</div><div class='add'>+/*   Version 1.2.5 additional entry points.                         */</div><div class='add'>+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("adler32_combine")</div><div class='add'>+  EXPORT SYMBOL("adler32_combine64")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("crc32_combine")</div><div class='add'>+  EXPORT SYMBOL("crc32_combine64")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      GZLIB        ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("gzbuffer")</div><div class='add'>+  EXPORT SYMBOL("gzoffset")</div><div class='add'>+  EXPORT SYMBOL("gzoffset64")</div><div class='add'>+  EXPORT SYMBOL("gzopen64")</div><div class='add'>+  EXPORT SYMBOL("gzseek64")</div><div class='add'>+  EXPORT SYMBOL("gztell64")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      GZREAD       ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("gzclose_r")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("gzclose_w")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("inflateMark")</div><div class='add'>+  EXPORT SYMBOL("inflatePrime")</div><div class='add'>+  EXPORT SYMBOL("inflateReset2")</div><div class='add'>+  EXPORT SYMBOL("inflateUndermine")</div><div class='add'>+</div><div class='add'>+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/</div><div class='add'>+/*   Version 1.2.6 additional entry points.                         */</div><div class='add'>+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("deflateResetKeep")</div><div class='add'>+  EXPORT SYMBOL("deflatePending")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("gzgetc_")</div><div class='add'>+</div><div class='add'>+/********************************************************************/</div><div class='add'>+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */</div><div class='add'>+/********************************************************************/</div><div class='add'>+</div><div class='add'>+  EXPORT SYMBOL("inflateResetKeep")</div><div class='add'>+</div><div class='ctx'> ENDPGMEXP</div><div class='head'>diff --git a/compat/zlib/as400/compile.clp b/compat/zlib/as400/compile.clp<br/>new file mode 100644<br/>index 0000000..8d0c58f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/as400/compile.clp?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/compile.clp</a></div><div class='hunk'>@@ -0,0 +1,110 @@</div><div class='add'>+/******************************************************************************/</div><div class='add'>+/*                                                                            */</div><div class='add'>+/*  ZLIB                                                                      */</div><div class='add'>+/*                                                                            */</div><div class='add'>+/*    Compile sources into modules and link them into a service program.      */</div><div class='add'>+/*                                                                            */</div><div class='add'>+/******************************************************************************/</div><div class='add'>+</div><div class='add'>+             PGM</div><div class='add'>+</div><div class='add'>+/*      Configuration adjustable parameters.                                  */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;SRCLIB) TYPE(*CHAR) LEN(10) +</div><div class='add'>+                          VALUE('ZLIB')                         /* Source library. */</div><div class='add'>+             DCL        VAR(&amp;SRCFILE) TYPE(*CHAR) LEN(10) +</div><div class='add'>+                          VALUE('SOURCES')                      /* Source member file. */</div><div class='add'>+             DCL        VAR(&amp;CTLFILE) TYPE(*CHAR) LEN(10) +</div><div class='add'>+                          VALUE('TOOLS')                        /* Control member file. */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;MODLIB) TYPE(*CHAR) LEN(10) +</div><div class='add'>+                          VALUE('ZLIB')                         /* Module library. */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;SRVLIB) TYPE(*CHAR) LEN(10) +</div><div class='add'>+                          VALUE('LGPL')                         /* Service program library. */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;CFLAGS) TYPE(*CHAR) +</div><div class='add'>+                          VALUE('OPTIMIZE(40)')                 /* Compile options. */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;TGTRLS) TYPE(*CHAR) +</div><div class='add'>+                          VALUE('V5R3M0')                       /* Target release. */</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*      Working storage.                                                      */</div><div class='add'>+</div><div class='add'>+             DCL        VAR(&amp;CMDLEN) TYPE(*DEC) LEN(15 5) VALUE(300)    /* Command length. */</div><div class='add'>+             DCL        VAR(&amp;CMD) TYPE(*CHAR) LEN(512)</div><div class='add'>+             DCL        VAR(&amp;FIXDCMD) TYPE(*CHAR) LEN(512)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*      Compile sources into modules.                                         */</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;FIXDCMD) VALUE('CRTCMOD' *BCAT &amp;CFLAGS *BCAT      +</div><div class='add'>+                        'SYSIFCOPT(*IFS64IO)' *BCAT                            +</div><div class='add'>+                        'DEFINE(''_LARGEFILE64_SOURCE''' *BCAT                 +</div><div class='add'>+                        '''_LFS64_LARGEFILE=1'') TGTRLS(' *TCAT &amp;TGTRLS *TCAT  +</div><div class='add'>+                        ') SRCFILE(' *TCAT &amp;SRCLIB *TCAT '/' *TCAT             +</div><div class='add'>+                        &amp;SRCFILE *TCAT ') MODULE(' *TCAT &amp;MODLIB *TCAT '/')</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'ADLER32)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'COMPRESS)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'CRC32)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'DEFLATE)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'GZCLOSE)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'GZLIB)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'GZREAD)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'GZWRITE)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'INFBACK)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'INFFAST)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'INFLATE)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'INFTREES)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'TREES)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'UNCOMPR)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+             CHGVAR     VAR(&amp;CMD) VALUE(&amp;FIXDCMD *TCAT 'ZUTIL)')</div><div class='add'>+             CALL       PGM(QCMDEXC) PARM(&amp;CMD &amp;CMDLEN)</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+/*      Link modules into a service program.                                  */</div><div class='add'>+</div><div class='add'>+             CRTSRVPGM  SRVPGM(&amp;SRVLIB/ZLIB) +</div><div class='add'>+                          MODULE(&amp;MODLIB/ADLER32     &amp;MODLIB/COMPRESS    +</div><div class='add'>+                                 &amp;MODLIB/CRC32       &amp;MODLIB/DEFLATE     +</div><div class='add'>+                                 &amp;MODLIB/GZCLOSE     &amp;MODLIB/GZLIB       +</div><div class='add'>+                                 &amp;MODLIB/GZREAD      &amp;MODLIB/GZWRITE     +</div><div class='add'>+                                 &amp;MODLIB/INFBACK     &amp;MODLIB/INFFAST     +</div><div class='add'>+                                 &amp;MODLIB/INFLATE     &amp;MODLIB/INFTREES    +</div><div class='add'>+                                 &amp;MODLIB/TREES       &amp;MODLIB/UNCOMPR     +</div><div class='add'>+                                 &amp;MODLIB/ZUTIL)                          +</div><div class='add'>+                          SRCFILE(&amp;SRCLIB/&amp;CTLFILE) SRCMBR(BNDSRC)       +</div><div class='add'>+                          TEXT('ZLIB 1.2.7') TGTRLS(&amp;TGTRLS)</div><div class='add'>+</div><div class='add'>+             ENDPGM</div><div class='head'>diff --git a/compat/zlib/old/as400/readme.txt b/compat/zlib/as400/readme.txt<br/>index beae13f..23cd1b8 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/old/as400/readme.txt?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/old/as400/readme.txt</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/as400/readme.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/readme.txt</a></div><div class='hunk'>@@ -1,4 +1,4 @@</div><div class='del'>-        ZLIB version 1.2.3 for AS400 installation instructions</div><div class='add'>+        ZLIB version 1.2.7 for AS400 installation instructions</div><div class='ctx'> </div><div class='ctx'> I) From an AS400 *SAVF file:</div><div class='ctx'> </div><div class='hunk'>@@ -8,7 +8,7 @@ On the AS400:</div><div class='ctx'> </div><div class='ctx'> _       Create the ZLIB AS400 library:</div><div class='ctx'> </div><div class='del'>-        CRTLIB LIB(ZLIB) TYPE(PROD) TEXT('ZLIB compression API library')</div><div class='add'>+        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')</div><div class='ctx'> </div><div class='ctx'> _       Create a work save file, for example:</div><div class='ctx'> </div><div class='hunk'>@@ -52,7 +52,7 @@ II) From the original source distribution:</div><div class='ctx'> </div><div class='ctx'> 1)      On the AS400, create the source library:</div><div class='ctx'> </div><div class='del'>-        CRTLIB LIB(ZLIB) TYPE(PROD) TEXT('ZLIB compression API library')</div><div class='add'>+        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')</div><div class='ctx'> </div><div class='ctx'> 2)      Create the source files:</div><div class='ctx'> </div><div class='hunk'>@@ -70,7 +70,10 @@ II) From the original source distribution:</div><div class='ctx'>     compress.c          COMPRESS C     ZLIB - Compress a memory buffer</div><div class='ctx'>     crc32.c             CRC32    C     ZLIB - Compute the CRC-32 of a data stream</div><div class='ctx'>     deflate.c           DEFLATE  C     ZLIB - Compress data using the deflation algorithm</div><div class='del'>-    gzio.c              GZIO     C     ZLIB - IO on .gz files</div><div class='add'>+    gzclose.c           GZCLOSE  C     ZLIB - Close .gz files</div><div class='add'>+    gzlib.c             GZLIB    C     ZLIB - Miscellaneous .gz files IO support</div><div class='add'>+    gzread.c            GZREAD   C     ZLIB - Read .gz files</div><div class='add'>+    gzwrite.c           GZWRITE  C     ZLIB - Write .gz files</div><div class='ctx'>     infback.c           INFBACK  C     ZLIB - Inflate using a callback interface</div><div class='ctx'>     inffast.c           INFFAST  C     ZLIB - Fast proc. literals &amp; length/distance pairs</div><div class='ctx'>     inflate.c           INFLATE  C     ZLIB - Interface to inflate modules</div><div class='hunk'>@@ -81,6 +84,7 @@ II) From the original source distribution:</div><div class='ctx'>                 H                      Original ZLIB C and ILE/RPG include files</div><div class='ctx'>     crc32.h             CRC32    C     ZLIB - CRC32 tables</div><div class='ctx'>     deflate.h           DEFLATE  C     ZLIB - Internal compression state</div><div class='add'>+    gzguts.h            GZGUTS   C     ZLIB - Definitions for the gzclose module</div><div class='ctx'>     inffast.h           INFFAST  C     ZLIB - Header to use inffast.c</div><div class='ctx'>     inffixed.h          INFFIXED C     ZLIB - Table for decoding fixed codes</div><div class='ctx'>     inflate.h           INFLATE  C     ZLIB - Internal inflate state definitions</div><div class='hunk'>@@ -108,4 +112,4 @@ Notes:  For AS400 ILE RPG programmers, a /copy member defining the ZLIB</div><div class='ctx'>                 implementation does not handle conversion from/to ASCII, so</div><div class='ctx'>                 text data code conversions must be done explicitely.</div><div class='ctx'> </div><div class='del'>-        Always open zipped files in binary mode.</div><div class='add'>+        Mainly for the reason above, always open zipped files in binary mode.</div><div class='head'>diff --git a/compat/zlib/old/as400/zlib.inc b/compat/zlib/as400/zlib.inc<br/>index a9a4f5c..747c598 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/old/as400/zlib.inc?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/old/as400/zlib.inc</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/as400/zlib.inc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/as400/zlib.inc</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'>       *  ZLIB.INC - Interface to the general purpose compression library</div><div class='ctx'>       *</div><div class='ctx'>       *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.</div><div class='del'>-      *  Version 1.2.3.9</div><div class='add'>+      *  Version 1.2.7</div><div class='ctx'>       *</div><div class='ctx'>       *</div><div class='ctx'>       *  WARNING:</div><div class='hunk'>@@ -22,16 +22,25 @@</div><div class='ctx'>       *</div><div class='ctx'>       *  Versioning information.</div><div class='ctx'>       *</div><div class='del'>-     D ZLIB_VERSION    C                   '1.2.3.9'</div><div class='del'>-     D ZLIB_VERNUM     C                   X'1239'</div><div class='add'>+     D ZLIB_VERSION    C                   '1.2.7'</div><div class='add'>+     D ZLIB_VERNUM     C                   X'1270'</div><div class='add'>+     D ZLIB_VER_MAJOR  C                   1</div><div class='add'>+     D ZLIB_VER_MINOR  C                   2</div><div class='add'>+     D ZLIB_VER_REVISION...</div><div class='add'>+     D                 C                   7</div><div class='add'>+     D ZLIB_VER_SUBREVISION...</div><div class='add'>+     D                 C                   0</div><div class='ctx'>       *</div><div class='ctx'>       *  Other equates.</div><div class='ctx'>       *</div><div class='ctx'>      D Z_NO_FLUSH      C                   0</div><div class='add'>+     D Z_PARTIAL_FLUSH...</div><div class='add'>+     D                 C                   1</div><div class='ctx'>      D Z_SYNC_FLUSH    C                   2</div><div class='ctx'>      D Z_FULL_FLUSH    C                   3</div><div class='ctx'>      D Z_FINISH        C                   4</div><div class='ctx'>      D Z_BLOCK         C                   5</div><div class='add'>+     D Z_TREES         C                   6</div><div class='ctx'>       *</div><div class='ctx'>      D Z_OK            C                   0</div><div class='ctx'>      D Z_STREAM_END    C                   1</div><div class='hunk'>@@ -72,6 +81,7 @@</div><div class='ctx'>      D z_streamp       S               *                                        Stream struct ptr</div><div class='ctx'>      D gzFile          S               *                                        File pointer</div><div class='ctx'>      D z_off_t         S             10i 0                                      Stream offsets</div><div class='add'>+     D z_off64_t       S             20i 0                                      Stream offsets</div><div class='ctx'>       *</div><div class='ctx'>       **************************************************************************</div><div class='ctx'>       *                               Structures</div><div class='hunk'>@@ -101,15 +111,15 @@</div><div class='ctx'>       **************************************************************************</div><div class='ctx'>       *</div><div class='ctx'>      D compress        PR            10I 0 extproc('compress')</div><div class='del'>-     D  dest                      32767    options(*varsize)                    Destination buffer</div><div class='add'>+     D  dest                      65535    options(*varsize)                    Destination buffer</div><div class='ctx'>      D  destLen                      10U 0                                      Destination length</div><div class='del'>-     D  source                    32767    const options(*varsize)              Source buffer</div><div class='add'>+     D  source                    65535    const options(*varsize)              Source buffer</div><div class='ctx'>      D  sourceLen                    10u 0 value                                Source length</div><div class='ctx'>       *</div><div class='ctx'>      D compress2       PR            10I 0 extproc('compress2')</div><div class='del'>-     D  dest                      32767    options(*varsize)                    Destination buffer</div><div class='add'>+     D  dest                      65535    options(*varsize)                    Destination buffer</div><div class='ctx'>      D  destLen                      10U 0                                      Destination length</div><div class='del'>-     D  source                    32767    const options(*varsize)              Source buffer</div><div class='add'>+     D  source                    65535    const options(*varsize)              Source buffer</div><div class='ctx'>      D  sourceLen                    10U 0 value                                Source length</div><div class='ctx'>      D  level                        10I 0 value                                Compression level</div><div class='ctx'>       *</div><div class='hunk'>@@ -117,34 +127,50 @@</div><div class='ctx'>      D  sourceLen                    10U 0 value</div><div class='ctx'>       *</div><div class='ctx'>      D uncompress      PR            10I 0 extproc('uncompress')</div><div class='del'>-     D  dest                      32767    options(*varsize)                    Destination buffer</div><div class='add'>+     D  dest                      65535    options(*varsize)                    Destination buffer</div><div class='ctx'>      D  destLen                      10U 0                                      Destination length</div><div class='del'>-     D  source                    32767    const options(*varsize)              Source buffer</div><div class='add'>+     D  source                    65535    const options(*varsize)              Source buffer</div><div class='ctx'>      D  sourceLen                    10U 0 value                                Source length</div><div class='ctx'>       *</div><div class='add'>+      /if not defined(LARGE_FILES)</div><div class='ctx'>      D gzopen          PR                  extproc('gzopen')</div><div class='ctx'>      D                                     like(gzFile)</div><div class='ctx'>      D  path                           *   value options(*string)               File pathname</div><div class='ctx'>      D  mode                           *   value options(*string)               Open mode</div><div class='add'>+      /else</div><div class='add'>+     D gzopen          PR                  extproc('gzopen64')</div><div class='add'>+     D                                     like(gzFile)</div><div class='add'>+     D  path                           *   value options(*string)               File pathname</div><div class='add'>+     D  mode                           *   value options(*string)               Open mode</div><div class='add'>+      *</div><div class='add'>+     D gzopen64        PR                  extproc('gzopen64')</div><div class='add'>+     D                                     like(gzFile)</div><div class='add'>+     D  path                           *   value options(*string)               File pathname</div><div class='add'>+     D  mode                           *   value options(*string)               Open mode</div><div class='add'>+      /endif</div><div class='ctx'>       *</div><div class='ctx'>      D gzdopen         PR                  extproc('gzdopen')</div><div class='ctx'>      D                                     like(gzFile)</div><div class='del'>-     D  fd                           10i 0 value                                File descriptor</div><div class='add'>+     D  fd                           10I 0 value                                File descriptor</div><div class='ctx'>      D  mode                           *   value options(*string)               Open mode</div><div class='ctx'>       *</div><div class='add'>+     D gzbuffer        PR            10I 0 extproc('gzbuffer')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+     D  size                         10U 0 value</div><div class='add'>+      *</div><div class='ctx'>      D gzsetparams     PR            10I 0 extproc('gzsetparams')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>      D  level                        10I 0 value</div><div class='del'>-     D  strategy                     10i 0 value</div><div class='add'>+     D  strategy                     10I 0 value</div><div class='ctx'>       *</div><div class='ctx'>      D gzread          PR            10I 0 extproc('gzread')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='del'>-     D  buf                       32767    options(*varsize)                    Buffer</div><div class='add'>+     D  buf                       65535    options(*varsize)                    Buffer</div><div class='ctx'>      D  len                          10u 0 value                                Buffer length</div><div class='ctx'>       *</div><div class='ctx'>      D gzwrite         PR            10I 0 extproc('gzwrite')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='del'>-     D  buf                       32767    const options(*varsize)              Buffer</div><div class='add'>+     D  buf                       65535    const options(*varsize)              Buffer</div><div class='ctx'>      D  len                          10u 0 value                                Buffer length</div><div class='ctx'>       *</div><div class='ctx'>      D gzputs          PR            10I 0 extproc('gzputs')</div><div class='hunk'>@@ -153,29 +179,87 @@</div><div class='ctx'>       *</div><div class='ctx'>      D gzgets          PR              *   extproc('gzgets')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='del'>-     D  buf                       32767    options(*varsize)                    Read buffer</div><div class='add'>+     D  buf                       65535    options(*varsize)                    Read buffer</div><div class='ctx'>      D  len                          10i 0 value                                Buffer length</div><div class='ctx'>       *</div><div class='add'>+     D gzputc          PR            10i 0 extproc('gzputc')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+     D  c                            10I 0 value                                Character to write</div><div class='add'>+      *</div><div class='add'>+     D gzgetc          PR            10i 0 extproc('gzgetc')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='add'>+     D gzgetc_         PR            10i 0 extproc('gzgetc_')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='add'>+     D gzungetc        PR            10i 0 extproc('gzungetc')</div><div class='add'>+     D  c                            10I 0 value                                Character to push</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='ctx'>      D gzflush         PR            10i 0 extproc('gzflush')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>      D  flush                        10I 0 value                                Type of flush</div><div class='ctx'>       *</div><div class='add'>+      /if not defined(LARGE_FILES)</div><div class='ctx'>      D gzseek          PR                  extproc('gzseek')</div><div class='ctx'>      D                                     like(z_off_t)</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>      D  offset                             value like(z_off_t)                  Offset</div><div class='ctx'>      D  whence                       10i 0 value                                Origin</div><div class='add'>+      /else</div><div class='add'>+     D gzseek          PR                  extproc('gzseek64')</div><div class='add'>+     D                                     like(z_off_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+     D  offset                             value like(z_off_t)                  Offset</div><div class='add'>+     D  whence                       10i 0 value                                Origin</div><div class='add'>+      *</div><div class='add'>+     D gzseek64        PR                  extproc('gzseek64')</div><div class='add'>+     D                                     like(z_off64_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+     D  offset                             value like(z_off64_t)                Offset</div><div class='add'>+     D  whence                       10i 0 value                                Origin</div><div class='add'>+      /endif</div><div class='ctx'>       *</div><div class='ctx'>      D gzrewind        PR            10i 0 extproc('gzrewind')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>       *</div><div class='add'>+      /if not defined(LARGE_FILES)</div><div class='ctx'>      D gztell          PR                  extproc('gztell')</div><div class='ctx'>      D                                     like(z_off_t)</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      /else</div><div class='add'>+     D gztell          PR                  extproc('gztell64')</div><div class='add'>+     D                                     like(z_off_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='add'>+     D gztell64        PR                  extproc('gztell64')</div><div class='add'>+     D                                     like(z_off64_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      /endif</div><div class='add'>+      *</div><div class='add'>+      /if not defined(LARGE_FILES)</div><div class='add'>+     D gzoffset        PR                  extproc('gzoffset')</div><div class='add'>+     D                                     like(z_off_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      /else</div><div class='add'>+     D gzoffset        PR                  extproc('gzoffset64')</div><div class='add'>+     D                                     like(z_off_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='add'>+     D gzoffset64      PR                  extproc('gzoffset64')</div><div class='add'>+     D                                     like(z_off64_t)</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      /endif</div><div class='ctx'>       *</div><div class='ctx'>      D gzeof           PR            10i 0 extproc('gzeof')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>       *</div><div class='add'>+     D gzclose_r       PR            10i 0 extproc('gzclose_r')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='add'>+     D gzclose_w       PR            10i 0 extproc('gzclose_w')</div><div class='add'>+     D  file                               value like(gzFile)                   File pointer</div><div class='add'>+      *</div><div class='ctx'>      D gzclose         PR            10i 0 extproc('gzclose')</div><div class='ctx'>      D  file                               value like(gzFile)                   File pointer</div><div class='ctx'>       *</div><div class='hunk'>@@ -234,7 +318,7 @@</div><div class='ctx'>      D deflateSetDictionary...</div><div class='ctx'>      D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary</div><div class='ctx'>      D  strm                               like(z_stream)                       Compression stream</div><div class='del'>-     D  dictionary                32767    const options(*varsize)              Dictionary bytes</div><div class='add'>+     D  dictionary                65535    const options(*varsize)              Dictionary bytes</div><div class='ctx'>      D  dictLength                   10U 0 value                                Dictionary length</div><div class='ctx'>       *</div><div class='ctx'>      D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm</div><div class='hunk'>@@ -253,9 +337,14 @@</div><div class='ctx'>      D  strm                               like(z_stream)                       Compression stream</div><div class='ctx'>      D  sourcelen                    10U 0 value                                Compression level</div><div class='ctx'>       *</div><div class='add'>+     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level &amp; strat</div><div class='add'>+     D  strm                               like(z_stream)                       Compression stream</div><div class='add'>+     D  pending                      10U 0                                      Pending bytes</div><div class='add'>+     D  bits                         10I 0                                      Pending bits</div><div class='add'>+      *</div><div class='ctx'>      D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level &amp; strat</div><div class='ctx'>      D  strm                               like(z_stream)                       Compression stream</div><div class='del'>-     D  bits                         10I 0 value                                Number of bits to insert</div><div class='add'>+     D  bits                         10I 0 value                                # of bits to insert</div><div class='ctx'>      D  value                        10I 0 value                                Bits to insert</div><div class='ctx'>       *</div><div class='ctx'>      D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion</div><div class='hunk'>@@ -267,7 +356,7 @@</div><div class='ctx'>      D inflateSetDictionary...</div><div class='ctx'>      D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary</div><div class='ctx'>      D  strm                               like(z_stream)                       Expansion stream</div><div class='del'>-     D  dictionary                32767    const options(*varsize)              Dictionary bytes</div><div class='add'>+     D  dictionary                65535    const options(*varsize)              Dictionary bytes</div><div class='ctx'>      D  dictLength                   10U 0 value                                Dictionary length</div><div class='ctx'>       *</div><div class='ctx'>      D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion</div><div class='hunk'>@@ -280,11 +369,23 @@</div><div class='ctx'>      D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream</div><div class='ctx'>      D  strm                               like(z_stream)                       Expansion stream</div><div class='ctx'>       *</div><div class='add'>+     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+     D  windowBits                   10I 0 value                                Log2(buffer size)</div><div class='add'>+      *</div><div class='add'>+     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+     D  bits                         10I 0 value                                Bit count</div><div class='add'>+     D  value                        10I 0 value                                Bits to insert</div><div class='add'>+      *</div><div class='add'>+     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+      *</div><div class='ctx'>      D inflateBackInit...</div><div class='ctx'>      D                 PR            10I 0 extproc('inflateBackInit_')</div><div class='ctx'>      D  strm                               like(z_stream)                       Expansion stream</div><div class='ctx'>      D  windowBits                   10I 0 value                                Log2(buffer size)</div><div class='del'>-     D  window                    32767    options(*varsize)                    Buffer</div><div class='add'>+     D  window                    65535    options(*varsize)                    Buffer</div><div class='ctx'>      D  version                        *   value options(*string)               Version string</div><div class='ctx'>      D  stream_size                  10i 0 value                                Stream struct. size</div><div class='ctx'>       *</div><div class='hunk'>@@ -307,12 +408,12 @@</div><div class='ctx'>       *</div><div class='ctx'>      D adler32         PR            10U 0 extproc('adler32')                   New checksum</div><div class='ctx'>      D  adler                        10U 0 value                                Old checksum</div><div class='del'>-     D  buf                       32767    const options(*varsize)              Bytes to accumulate</div><div class='add'>+     D  buf                       65535    const options(*varsize)              Bytes to accumulate</div><div class='ctx'>      D  len                          10U 0 value                                Buffer length</div><div class='ctx'>       *</div><div class='ctx'>      D crc32           PR            10U 0 extproc('crc32')                     New checksum</div><div class='ctx'>      D  crc                          10U 0 value                                Old checksum</div><div class='del'>-     D  buf                       32767    const options(*varsize)              Bytes to accumulate</div><div class='add'>+     D  buf                       65535    const options(*varsize)              Bytes to accumulate</div><div class='ctx'>      D  len                          10U 0 value                                Buffer length</div><div class='ctx'>       *</div><div class='ctx'>       **************************************************************************</div><div class='hunk'>@@ -328,4 +429,17 @@</div><div class='ctx'>       *</div><div class='ctx'>      D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs</div><div class='ctx'>       *</div><div class='add'>+     D inflateUndermine...</div><div class='add'>+     D                 PR            10I 0 extproc('inflateUndermine')</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+     D  arg                          10I 0 value                                Error code</div><div class='add'>+      *</div><div class='add'>+     D inflateResetKeep...</div><div class='add'>+     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+      *</div><div class='add'>+     D deflateResetKeep...</div><div class='add'>+     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream</div><div class='add'>+     D  strm                               like(z_stream)                       Expansion stream</div><div class='add'>+      *</div><div class='ctx'>       /endif</div><div class='head'>diff --git a/compat/zlib/compress.c b/compat/zlib/compress.c<br/>index 21fa4c1..ea4dfbe 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/compress.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/compress.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/compress.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/compress.c</a></div><div class='hunk'>@@ -3,7 +3,7 @@</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='del'>-/* @(#) $Id: compress.c,v 1.3 2010/04/20 14:50:10 nijtmans Exp $ */</div><div class='add'>+/* @(#) $Id$ */</div><div class='ctx'> </div><div class='ctx'> #define ZLIB_INTERNAL</div><div class='ctx'> #include "zlib.h"</div><div class='head'>diff --git a/compat/zlib/configure b/compat/zlib/configure<br/>index bd9edd2..36c7d8e 100755<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/configure?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/configure</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/configure?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/configure</a></div><div class='hunk'>@@ -13,39 +13,52 @@</div><div class='ctx'> # If you have problems, try without defining CC and CFLAGS before reporting</div><div class='ctx'> # an error.</div><div class='ctx'> </div><div class='add'>+# start off configure.log</div><div class='add'>+echo -------------------- &gt;&gt; configure.log</div><div class='add'>+echo $0 $* &gt;&gt; configure.log</div><div class='add'>+date &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# set command prefix for cross-compilation</div><div class='ctx'> if [ -n "${CHOST}" ]; then</div><div class='del'>-    uname="$(echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/')"</div><div class='add'>+    uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"</div><div class='ctx'>     CROSS_PREFIX="${CHOST}-"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# destination name for static library</div><div class='ctx'> STATICLIB=libz.a</div><div class='del'>-LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"</div><div class='add'>+</div><div class='add'>+# extract zlib version numbers from zlib.h</div><div class='ctx'> VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' &lt; zlib.h`</div><div class='ctx'> VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' &lt; zlib.h`</div><div class='ctx'> VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' &lt; zlib.h`</div><div class='ctx'> VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' &lt; zlib.h`</div><div class='add'>+</div><div class='add'>+# establish commands for library building</div><div class='ctx'> if "${CROSS_PREFIX}ar" --version &gt;/dev/null 2&gt;/dev/null || test $? -lt 126; then</div><div class='ctx'>     AR=${AR-"${CROSS_PREFIX}ar"}</div><div class='del'>-    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${AR}</div><div class='add'>+    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${AR} | tee -a configure.log</div><div class='ctx'> else</div><div class='ctx'>     AR=${AR-"ar"}</div><div class='del'>-    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${AR}</div><div class='add'>+    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${AR} | tee -a configure.log</div><div class='ctx'> fi</div><div class='del'>-AR_RC="${AR} rc"</div><div class='add'>+ARFLAGS=${ARFLAGS-"rc"}</div><div class='ctx'> if "${CROSS_PREFIX}ranlib" --version &gt;/dev/null 2&gt;/dev/null || test $? -lt 126; then</div><div class='ctx'>     RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}</div><div class='del'>-    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${RANLIB}</div><div class='add'>+    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${RANLIB} | tee -a configure.log</div><div class='ctx'> else</div><div class='ctx'>     RANLIB=${RANLIB-"ranlib"}</div><div class='ctx'> fi</div><div class='ctx'> if "${CROSS_PREFIX}nm" --version &gt;/dev/null 2&gt;/dev/null || test $? -lt 126; then</div><div class='ctx'>     NM=${NM-"${CROSS_PREFIX}nm"}</div><div class='del'>-    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${NM}</div><div class='add'>+    test -n "${CROSS_PREFIX}" &amp;&amp; echo Using ${NM} | tee -a configure.log</div><div class='ctx'> else</div><div class='ctx'>     NM=${NM-"nm"}</div><div class='ctx'> fi</div><div class='add'>+</div><div class='add'>+# set defaults before processing command line options</div><div class='ctx'> LDCONFIG=${LDCONFIG-"ldconfig"}</div><div class='ctx'> LDSHAREDLIBC="${LDSHAREDLIBC--lc}"</div><div class='add'>+ARCHS=</div><div class='ctx'> prefix=${prefix-/usr/local}</div><div class='ctx'> exec_prefix=${exec_prefix-'${prefix}'}</div><div class='ctx'> libdir=${libdir-'${exec_prefix}/lib'}</div><div class='hunk'>@@ -54,20 +67,25 @@ includedir=${includedir-'${prefix}/include'}</div><div class='ctx'> mandir=${mandir-'${prefix}/share/man'}</div><div class='ctx'> shared_ext='.so'</div><div class='ctx'> shared=1</div><div class='add'>+solo=0</div><div class='add'>+cover=0</div><div class='ctx'> zprefix=0</div><div class='ctx'> build64=0</div><div class='ctx'> gcc=0</div><div class='ctx'> old_cc="$CC"</div><div class='ctx'> old_cflags="$CFLAGS"</div><div class='add'>+OBJC='$(OBJZ) $(OBJG)'</div><div class='add'>+PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'</div><div class='ctx'> </div><div class='add'>+# process command line options</div><div class='ctx'> while test $# -ge 1</div><div class='ctx'> do</div><div class='ctx'> case "$1" in</div><div class='ctx'>     -h* | --help)</div><div class='del'>-      echo 'usage:'</div><div class='del'>-      echo '  configure [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]'</div><div class='del'>-      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]'</div><div class='del'>-      echo '    [--includedir=INCLUDEDIR]'</div><div class='add'>+      echo 'usage:' | tee -a configure.log</div><div class='add'>+      echo '  configure [--zprefix] [--prefix=PREFIX]  [--eprefix=EXPREFIX]' | tee -a configure.log</div><div class='add'>+      echo '    [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log</div><div class='add'>+      echo '    [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log</div><div class='ctx'>         exit 0 ;;</div><div class='ctx'>     -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;</div><div class='ctx'>     -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;</div><div class='hunk'>@@ -81,32 +99,93 @@ case "$1" in</div><div class='ctx'>     -i* | --includedir) includedir="$2"; shift; shift ;;</div><div class='ctx'>     -s* | --shared | --enable-shared) shared=1; shift ;;</div><div class='ctx'>     -t | --static) shared=0; shift ;;</div><div class='add'>+    --solo) solo=1; shift ;;</div><div class='add'>+    --cover) cover=1; shift ;;</div><div class='ctx'>     -z* | --zprefix) zprefix=1; shift ;;</div><div class='ctx'>     -6* | --64) build64=1; shift ;;</div><div class='del'>-    --sysconfdir=*) echo "ignored option: --sysconfdir"; shift ;;</div><div class='del'>-    --localstatedir=*) echo "ignored option: --localstatedir"; shift ;;</div><div class='del'>-    *) echo "unknown option: $1"; echo "$0 --help for help"; exit 1 ;;</div><div class='add'>+    -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;</div><div class='add'>+    --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;</div><div class='add'>+    --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;</div><div class='add'>+    *) echo "unknown option: $1"; echo "$0 --help for help" | tee -a configure.log; exit 1 ;;</div><div class='ctx'>     esac</div><div class='ctx'> done</div><div class='ctx'> </div><div class='add'>+# define functions for testing compiler and library characteristics and logging the results</div><div class='ctx'> test=ztest$$</div><div class='add'>+</div><div class='add'>+show()</div><div class='add'>+{</div><div class='add'>+  case "$*" in</div><div class='add'>+    *$test.c*)</div><div class='add'>+      echo === $test.c === &gt;&gt; configure.log</div><div class='add'>+      cat $test.c &gt;&gt; configure.log</div><div class='add'>+      echo === &gt;&gt; configure.log;;</div><div class='add'>+  esac</div><div class='add'>+  echo $* &gt;&gt; configure.log</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+cat &gt; $test.c &lt;&lt;EOF</div><div class='add'>+#error error</div><div class='add'>+EOF</div><div class='add'>+if ($CC -c $CFLAGS $test.c) 2&gt;/dev/null; then</div><div class='add'>+  try()</div><div class='add'>+  {</div><div class='add'>+    show $*</div><div class='add'>+    test "`( $* ) 2&gt;&amp;1 | tee -a configure.log`" = ""</div><div class='add'>+  }</div><div class='add'>+  echo - using any output from compiler to indicate an error &gt;&gt; configure.log</div><div class='add'>+else</div><div class='add'>+  try()</div><div class='add'>+  {</div><div class='add'>+    show $*</div><div class='add'>+    ( $* ) &gt;&gt; configure.log 2&gt;&amp;1</div><div class='add'>+    ret=$?</div><div class='add'>+    if test $ret -ne 0; then</div><div class='add'>+      echo "(exit code "$ret")" &gt;&gt; configure.log</div><div class='add'>+    fi</div><div class='add'>+    return $ret</div><div class='add'>+  }</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+tryboth()</div><div class='add'>+{</div><div class='add'>+  show $*</div><div class='add'>+  got=`( $* ) 2&gt;&amp;1`</div><div class='add'>+  ret=$?</div><div class='add'>+  printf %s "$got" &gt;&gt; configure.log</div><div class='add'>+  if test $ret -ne 0; then</div><div class='add'>+    return $ret</div><div class='add'>+  fi</div><div class='add'>+  test "$got" = ""</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for gcc vs. cc and set compile and link flags based on the system identified by uname</div><div class='ctx'> cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> extern int getchar();</div><div class='ctx'> int hello() {return getchar();}</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-test -z "$CC" &amp;&amp; echo Checking for ${CROSS_PREFIX}gcc...</div><div class='add'>+test -z "$CC" &amp;&amp; echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log</div><div class='ctx'> cc=${CC-${CROSS_PREFIX}gcc}</div><div class='ctx'> cflags=${CFLAGS-"-O3"}</div><div class='ctx'> # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure</div><div class='ctx'> case "$cc" in</div><div class='ctx'>   *gcc*) gcc=1 ;;</div><div class='add'>+  *clang*) gcc=1 ;;</div><div class='add'>+esac</div><div class='add'>+case `$cc -v 2&gt;&amp;1` in</div><div class='add'>+  *gcc*) gcc=1 ;;</div><div class='ctx'> esac</div><div class='ctx'> </div><div class='del'>-if test "$gcc" -eq 1 &amp;&amp; ($cc -c $cflags $test.c) 2&gt;/dev/null; then</div><div class='add'>+show $cc -c $cflags $test.c</div><div class='add'>+if test "$gcc" -eq 1 &amp;&amp; ($cc -c $cflags $test.c) &gt;&gt; configure.log 2&gt;&amp;1; then</div><div class='add'>+  echo ... using gcc &gt;&gt; configure.log</div><div class='ctx'>   CC="$cc"</div><div class='add'>+  CFLAGS="${CFLAGS--O3} ${ARCHS}"</div><div class='ctx'>   SFLAGS="${CFLAGS--O3} -fPIC"</div><div class='del'>-  CFLAGS="${CFLAGS--O3}"</div><div class='add'>+  LDFLAGS="${LDFLAGS} ${ARCHS}"</div><div class='ctx'>   if test $build64 -eq 1; then</div><div class='ctx'>     CFLAGS="${CFLAGS} -m64"</div><div class='ctx'>     SFLAGS="${SFLAGS} -m64"</div><div class='hunk'>@@ -118,13 +197,17 @@ if test "$gcc" -eq 1 &amp;&amp; ($cc -c $cflags $test.c) 2&gt;/dev/null; then</div><div class='ctx'>     uname=`(uname -s || echo unknown) 2&gt;/dev/null`</div><div class='ctx'>   fi</div><div class='ctx'>   case "$uname" in</div><div class='del'>-  Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;</div><div class='add'>+  Linux* | linux* | GNU | GNU/* | solaris*)</div><div class='add'>+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;</div><div class='add'>+  *BSD | *bsd* | DragonFly)</div><div class='add'>+        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}</div><div class='add'>+        LDCONFIG="ldconfig -m" ;;</div><div class='ctx'>   CYGWIN* | Cygwin* | cygwin* | OS/2*)</div><div class='ctx'>         EXE='.exe' ;;</div><div class='del'>-  MINGW*|mingw*)</div><div class='add'>+  MINGW* | mingw*)</div><div class='ctx'> # temporary bypass</div><div class='ctx'>         rm -f $test.[co] $test $test$shared_ext</div><div class='del'>-        echo "Please use win32/Makefile.gcc instead."</div><div class='add'>+        echo "Please use win32/Makefile.gcc instead." | tee -a configure.log</div><div class='ctx'>         exit 1</div><div class='ctx'>         LDSHARED=${LDSHARED-"$cc -shared"}</div><div class='ctx'>         LDSHAREDLIBC=""</div><div class='hunk'>@@ -142,17 +225,21 @@ if test "$gcc" -eq 1 &amp;&amp; ($cc -c $cflags $test.c) 2&gt;/dev/null; then</div><div class='ctx'>                  shared_ext='.sl'</div><div class='ctx'>                  SHAREDLIB='libz.sl' ;;</div><div class='ctx'>          esac ;;</div><div class='del'>-  Darwin*)   shared_ext='.dylib'</div><div class='add'>+  Darwin* | darwin*)</div><div class='add'>+             shared_ext='.dylib'</div><div class='ctx'>              SHAREDLIB=libz$shared_ext</div><div class='ctx'>              SHAREDLIBV=libz.$VER$shared_ext</div><div class='ctx'>              SHAREDLIBM=libz.$VER1$shared_ext</div><div class='del'>-             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} ;;</div><div class='add'>+             LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}</div><div class='add'>+             AR="/usr/bin/libtool"</div><div class='add'>+             ARFLAGS="-o" ;;</div><div class='ctx'>   *)             LDSHARED=${LDSHARED-"$cc -shared"} ;;</div><div class='ctx'>   esac</div><div class='ctx'> else</div><div class='ctx'>   # find system name and corresponding cc options</div><div class='ctx'>   CC=${CC-cc}</div><div class='ctx'>   gcc=0</div><div class='add'>+  echo ... using $CC &gt;&gt; configure.log</div><div class='ctx'>   if test -z "$uname"; then</div><div class='ctx'>     uname=`(uname -sr || echo unknown) 2&gt;/dev/null`</div><div class='ctx'>   fi</div><div class='hunk'>@@ -183,19 +270,34 @@ else</div><div class='ctx'>              CFLAGS=${CFLAGS-"-4 -O"}</div><div class='ctx'>              LDSHARED=${LDSHARED-"cc"}</div><div class='ctx'>              RANLIB=${RANLIB-"true"}</div><div class='del'>-             AR_RC="cc -A" ;;</div><div class='add'>+             AR="cc"</div><div class='add'>+             ARFLAGS="-A" ;;</div><div class='ctx'>   SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}</div><div class='ctx'>              CFLAGS=${CFLAGS-"-O3"}</div><div class='ctx'>              LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;</div><div class='del'>-  SunOS\ 5*) LDSHARED=${LDSHARED-"cc -G"}</div><div class='del'>-         case `(uname -m || echo unknown) 2&gt;/dev/null` in</div><div class='del'>-         i86*)</div><div class='del'>-             SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}</div><div class='del'>-             CFLAGS=${CFLAGS-"-xpentium -fast"} ;;</div><div class='del'>-         *)</div><div class='del'>-             SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}</div><div class='del'>-             CFLAGS=${CFLAGS-"-fast -xcg92"} ;;</div><div class='del'>-         esac ;;</div><div class='add'>+  SunOS\ 5* | solaris*)</div><div class='add'>+         LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}</div><div class='add'>+         SFLAGS=${CFLAGS-"-fast -KPIC"}</div><div class='add'>+         CFLAGS=${CFLAGS-"-fast"}</div><div class='add'>+         if test $build64 -eq 1; then</div><div class='add'>+             # old versions of SunPRO/Workshop/Studio don't support -m64,</div><div class='add'>+             # but newer ones do.  Check for it.</div><div class='add'>+             flag64=`$CC -flags | egrep -- '^-m64'`</div><div class='add'>+             if test x"$flag64" != x"" ; then</div><div class='add'>+                 CFLAGS="${CFLAGS} -m64"</div><div class='add'>+                 SFLAGS="${SFLAGS} -m64"</div><div class='add'>+             else</div><div class='add'>+                 case `(uname -m || echo unknown) 2&gt;/dev/null` in</div><div class='add'>+                   i86*)</div><div class='add'>+                     SFLAGS="$SFLAGS -xarch=amd64"</div><div class='add'>+                     CFLAGS="$CFLAGS -xarch=amd64" ;;</div><div class='add'>+                   *)</div><div class='add'>+                     SFLAGS="$SFLAGS -xarch=v9"</div><div class='add'>+                     CFLAGS="$CFLAGS -xarch=v9" ;;</div><div class='add'>+                 esac</div><div class='add'>+             fi</div><div class='add'>+         fi</div><div class='add'>+         ;;</div><div class='ctx'>   SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}</div><div class='ctx'>              CFLAGS=${CFLAGS-"-O2"}</div><div class='ctx'>              LDSHARED=${LDSHARED-"ld"} ;;</div><div class='hunk'>@@ -225,25 +327,25 @@ else</div><div class='ctx'>   esac</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# destination names for shared library if not defined above</div><div class='ctx'> SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}</div><div class='ctx'> SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}</div><div class='ctx'> SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# see if shared library build supported</div><div class='ctx'> if test $shared -eq 1; then</div><div class='del'>-  echo Checking for shared library support...</div><div class='add'>+  echo Checking for shared library support... | tee -a configure.log</div><div class='ctx'>   # we must test in two steps (cc then ld), required at least on SunOS 4.x</div><div class='del'>-  if test "`($CC -w -c $SFLAGS $test.c) 2&gt;&amp;1`" = "" &amp;&amp;</div><div class='del'>-     test "`($LDSHARED $SFLAGS -o $test$shared_ext $test.o) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo Building shared library $SHAREDLIBV with $CC.</div><div class='add'>+  if try $CC -w -c $SFLAGS $test.c &amp;&amp;</div><div class='add'>+     try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then</div><div class='add'>+    echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log</div><div class='ctx'>   elif test -z "$old_cc" -a -z "$old_cflags"; then</div><div class='del'>-    echo No shared library support.</div><div class='add'>+    echo No shared library support. | tee -a configure.log</div><div class='ctx'>     shared=0;</div><div class='ctx'>   else</div><div class='del'>-    echo Tested $CC -w -c $SFLAGS $test.c</div><div class='del'>-    $CC -w -c $SFLAGS $test.c</div><div class='del'>-    echo Tested $LDSHARED $SFLAGS -o $test$shared_ext $test.o</div><div class='del'>-    $LDSHARED $SFLAGS -o $test$shared_ext $test.o</div><div class='del'>-    echo 'No shared library support; try without defining CC and CFLAGS'</div><div class='add'>+    echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log</div><div class='ctx'>     shared=0;</div><div class='ctx'>   fi</div><div class='ctx'> fi</div><div class='hunk'>@@ -254,25 +356,45 @@ if test $shared -eq 0; then</div><div class='ctx'>   SHAREDLIB=""</div><div class='ctx'>   SHAREDLIBV=""</div><div class='ctx'>   SHAREDLIBM=""</div><div class='del'>-  echo Building static library $STATICLIB version $VER with $CC.</div><div class='add'>+  echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log</div><div class='ctx'> else</div><div class='ctx'>   ALL="static shared"</div><div class='ctx'>   TEST="all teststatic testshared"</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for underscores in external names for use by assembler code</div><div class='add'>+CPP=${CPP-"$CC -E"}</div><div class='add'>+case $CFLAGS in</div><div class='add'>+  *ASMV*)</div><div class='add'>+    echo &gt;&gt; configure.log</div><div class='add'>+    show "$NM $test.o | grep _hello"</div><div class='add'>+    if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then</div><div class='add'>+      CPP="$CPP -DNO_UNDERLINE"</div><div class='add'>+      echo Checking for underline in external names... No. | tee -a configure.log</div><div class='add'>+    else</div><div class='add'>+      echo Checking for underline in external names... Yes. | tee -a configure.log</div><div class='add'>+    fi ;;</div><div class='add'>+esac</div><div class='add'>+</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for large file support, and if none, check for fseeko()</div><div class='ctx'> cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;sys/types.h&gt;</div><div class='ctx'> off64_t dummy = 0;</div><div class='ctx'> EOF</div><div class='del'>-if test "`($CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c) 2&gt;&amp;1`" = ""; then</div><div class='add'>+if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then</div><div class='ctx'>   CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"</div><div class='ctx'>   SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"</div><div class='ctx'>   ALL="${ALL} all64"</div><div class='ctx'>   TEST="${TEST} test64"</div><div class='del'>-  echo "Checking for off64_t... Yes."</div><div class='del'>-  echo "Checking for fseeko... Yes."</div><div class='add'>+  echo "Checking for off64_t... Yes." | tee -a configure.log</div><div class='add'>+  echo "Checking for fseeko... Yes." | tee -a configure.log</div><div class='ctx'> else</div><div class='del'>-  echo "Checking for off64_t... No."</div><div class='add'>+  echo "Checking for off64_t... No." | tee -a configure.log</div><div class='add'>+  echo &gt;&gt; configure.log</div><div class='ctx'>   cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> int main(void) {</div><div class='hunk'>@@ -280,272 +402,367 @@ int main(void) {</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='del'>-  if test "`($CC $CFLAGS -o $test $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for fseeko... Yes."</div><div class='add'>+  if try $CC $CFLAGS -o $test $test.c; then</div><div class='add'>+    echo "Checking for fseeko... Yes." | tee -a configure.log</div><div class='ctx'>   else</div><div class='ctx'>     CFLAGS="${CFLAGS} -DNO_FSEEKO"</div><div class='ctx'>     SFLAGS="${SFLAGS} -DNO_FSEEKO"</div><div class='del'>-    echo "Checking for fseeko... No."</div><div class='add'>+    echo "Checking for fseeko... No." | tee -a configure.log</div><div class='ctx'>   fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for strerror() for use by gz* functions</div><div class='add'>+cat &gt; $test.c &lt;&lt;EOF</div><div class='add'>+#include &lt;string.h&gt;</div><div class='add'>+#include &lt;errno.h&gt;</div><div class='add'>+int main() { return strlen(strerror(errno)); }</div><div class='add'>+EOF</div><div class='add'>+if try $CC $CFLAGS -o $test $test.c; then</div><div class='add'>+  echo "Checking for strerror... Yes." | tee -a configure.log</div><div class='add'>+else</div><div class='add'>+  CFLAGS="${CFLAGS} -DNO_STRERROR"</div><div class='add'>+  SFLAGS="${SFLAGS} -DNO_STRERROR"</div><div class='add'>+  echo "Checking for strerror... No." | tee -a configure.log</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# copy clean zconf.h for subsequent edits</div><div class='ctx'> cp -p zconf.h.in zconf.h</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for unistd.h and save result in zconf.h</div><div class='ctx'> cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;unistd.h&gt;</div><div class='ctx'> int main() { return 0; }</div><div class='ctx'> EOF</div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='add'>+if try $CC -c $CFLAGS $test.c; then</div><div class='ctx'>   sed &lt; zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" &gt; zconf.temp.h</div><div class='ctx'>   mv zconf.temp.h zconf.h</div><div class='del'>-  echo "Checking for unistd.h... Yes."</div><div class='add'>+  echo "Checking for unistd.h... Yes." | tee -a configure.log</div><div class='ctx'> else</div><div class='del'>-  echo "Checking for unistd.h... No."</div><div class='add'>+  echo "Checking for unistd.h... No." | tee -a configure.log</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# check for stdarg.h and save result in zconf.h</div><div class='add'>+cat &gt; $test.c &lt;&lt;EOF</div><div class='add'>+#include &lt;stdarg.h&gt;</div><div class='add'>+int main() { return 0; }</div><div class='add'>+EOF</div><div class='add'>+if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+  sed &lt; zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" &gt; zconf.temp.h</div><div class='add'>+  mv zconf.temp.h zconf.h</div><div class='add'>+  echo "Checking for stdarg.h... Yes." | tee -a configure.log</div><div class='add'>+else</div><div class='add'>+  echo "Checking for stdarg.h... No." | tee -a configure.log</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# if the z_ prefix was requested, save that in zconf.h</div><div class='ctx'> if test $zprefix -eq 1; then</div><div class='ctx'>   sed &lt; zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" &gt; zconf.temp.h</div><div class='ctx'>   mv zconf.temp.h zconf.h</div><div class='del'>-  echo "Using z_ prefix on all symbols."</div><div class='add'>+  echo &gt;&gt; configure.log</div><div class='add'>+  echo "Using z_ prefix on all symbols." | tee -a configure.log</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists</div><div class='add'>+if test $solo -eq 1; then</div><div class='add'>+  sed '/#define ZCONF_H/a\</div><div class='add'>+#define Z_SOLO</div><div class='add'>+</div><div class='add'>+' &lt; zconf.h &gt; zconf.temp.h</div><div class='add'>+  mv zconf.temp.h zconf.h</div><div class='add'>+OBJC='$(OBJZ)'</div><div class='add'>+PIC_OBJC='$(PIC_OBJZ)'</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X</div><div class='add'>+if test $cover -eq 1; then</div><div class='add'>+  CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"</div><div class='add'>+  if test -n "$GCC_CLASSIC"; then</div><div class='add'>+    CC=$GCC_CLASSIC</div><div class='add'>+  fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions</div><div class='add'>+# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a</div><div class='add'>+# return value.  The most secure result is vsnprintf() with a return value.  snprintf() with a</div><div class='add'>+# return value is secure as well, but then gzprintf() will be limited to 20 arguments.</div><div class='ctx'> cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='ctx'> #include "zconf.h"</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'> #ifndef STDC</div><div class='ctx'>   choke me</div><div class='ctx'> #endif</div><div class='del'>-</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='add'>+if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log</div><div class='ctx'> </div><div class='del'>-if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()."</div><div class='del'>-</div><div class='add'>+  echo &gt;&gt; configure.log</div><div class='ctx'>   cat &gt; $test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest(const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'>   char buf[20];</div><div class='ctx'>   va_list ap;</div><div class='del'>-</div><div class='ctx'>   va_start(ap, fmt);</div><div class='ctx'>   vsnprintf(buf, sizeof(buf), fmt, ap);</div><div class='ctx'>   va_end(ap);</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest("Hello%d\n", 1));</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='add'>+  if try $CC $CFLAGS -o $test $test.c; then</div><div class='add'>+    echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log</div><div class='ctx'> </div><div class='del'>-  if test "`($CC $CFLAGS -o $test $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for vsnprintf() in stdio.h... Yes."</div><div class='del'>-</div><div class='add'>+    echo &gt;&gt; configure.log</div><div class='ctx'>     cat &gt;$test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest(const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'>   int n;</div><div class='ctx'>   char buf[20];</div><div class='ctx'>   va_list ap;</div><div class='del'>-</div><div class='ctx'>   va_start(ap, fmt);</div><div class='ctx'>   n = vsnprintf(buf, sizeof(buf), fmt, ap);</div><div class='ctx'>   va_end(ap);</div><div class='ctx'>   return n;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest("Hello%d\n", 1));</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of vsnprintf()... Yes."</div><div class='add'>+    if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+      echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log</div><div class='ctx'>     else</div><div class='ctx'>       CFLAGS="$CFLAGS -DHAS_vsnprintf_void"</div><div class='ctx'>       SFLAGS="$SFLAGS -DHAS_vsnprintf_void"</div><div class='del'>-      echo "Checking for return value of vsnprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently vsnprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='add'>+      echo "Checking for return value of vsnprintf()... No." | tee -a configure.log</div><div class='add'>+      echo "  WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log</div><div class='add'>+      echo "  can build but will be open to possible string-format security" | tee -a configure.log</div><div class='add'>+      echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'>     fi</div><div class='ctx'>   else</div><div class='ctx'>     CFLAGS="$CFLAGS -DNO_vsnprintf"</div><div class='ctx'>     SFLAGS="$SFLAGS -DNO_vsnprintf"</div><div class='del'>-    echo "Checking for vsnprintf() in stdio.h... No."</div><div class='del'>-    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib"</div><div class='del'>-    echo "  can build but will be open to possible buffer-overflow security"</div><div class='del'>-    echo "  vulnerabilities."</div><div class='add'>+    echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log</div><div class='add'>+    echo "  WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log</div><div class='add'>+    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log</div><div class='add'>+    echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'> </div><div class='add'>+    echo &gt;&gt; configure.log</div><div class='ctx'>     cat &gt;$test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdarg.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest(const char *fmt, ...)</div><div class='ctx'> {</div><div class='ctx'>   int n;</div><div class='ctx'>   char buf[20];</div><div class='ctx'>   va_list ap;</div><div class='del'>-</div><div class='ctx'>   va_start(ap, fmt);</div><div class='ctx'>   n = vsprintf(buf, fmt, ap);</div><div class='ctx'>   va_end(ap);</div><div class='ctx'>   return n;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest("Hello%d\n", 1));</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of vsprintf()... Yes."</div><div class='add'>+    if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+      echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log</div><div class='ctx'>     else</div><div class='ctx'>       CFLAGS="$CFLAGS -DHAS_vsprintf_void"</div><div class='ctx'>       SFLAGS="$SFLAGS -DHAS_vsprintf_void"</div><div class='del'>-      echo "Checking for return value of vsprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently vsprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='add'>+      echo "Checking for return value of vsprintf()... No." | tee -a configure.log</div><div class='add'>+      echo "  WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log</div><div class='add'>+      echo "  can build but will be open to possible string-format security" | tee -a configure.log</div><div class='add'>+      echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'>     fi</div><div class='ctx'>   fi</div><div class='ctx'> else</div><div class='del'>-  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()."</div><div class='add'>+  echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log</div><div class='ctx'> </div><div class='add'>+  echo &gt;&gt; configure.log</div><div class='ctx'>   cat &gt;$test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest()</div><div class='ctx'> {</div><div class='ctx'>   char buf[20];</div><div class='del'>-</div><div class='ctx'>   snprintf(buf, sizeof(buf), "%s", "foo");</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest());</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-  if test "`($CC $CFLAGS -o $test $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for snprintf() in stdio.h... Yes."</div><div class='add'>+  if try $CC $CFLAGS -o $test $test.c; then</div><div class='add'>+    echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log</div><div class='ctx'> </div><div class='add'>+    echo &gt;&gt; configure.log</div><div class='ctx'>     cat &gt;$test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest()</div><div class='ctx'> {</div><div class='ctx'>   char buf[20];</div><div class='del'>-</div><div class='ctx'>   return snprintf(buf, sizeof(buf), "%s", "foo");</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest());</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of snprintf()... Yes."</div><div class='add'>+    if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+      echo "Checking for return value of snprintf()... Yes." | tee -a configure.log</div><div class='ctx'>     else</div><div class='ctx'>       CFLAGS="$CFLAGS -DHAS_snprintf_void"</div><div class='ctx'>       SFLAGS="$SFLAGS -DHAS_snprintf_void"</div><div class='del'>-      echo "Checking for return value of snprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently snprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='add'>+      echo "Checking for return value of snprintf()... No." | tee -a configure.log</div><div class='add'>+      echo "  WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log</div><div class='add'>+      echo "  can build but will be open to possible string-format security" | tee -a configure.log</div><div class='add'>+      echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'>     fi</div><div class='ctx'>   else</div><div class='ctx'>     CFLAGS="$CFLAGS -DNO_snprintf"</div><div class='ctx'>     SFLAGS="$SFLAGS -DNO_snprintf"</div><div class='del'>-    echo "Checking for snprintf() in stdio.h... No."</div><div class='del'>-    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib"</div><div class='del'>-    echo "  can build but will be open to possible buffer-overflow security"</div><div class='del'>-    echo "  vulnerabilities."</div><div class='add'>+    echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log</div><div class='add'>+    echo "  WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log</div><div class='add'>+    echo "  can build but will be open to possible buffer-overflow security" | tee -a configure.log</div><div class='add'>+    echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'> </div><div class='add'>+    echo &gt;&gt; configure.log</div><div class='ctx'>     cat &gt;$test.c &lt;&lt;EOF</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='ctx'> int mytest()</div><div class='ctx'> {</div><div class='ctx'>   char buf[20];</div><div class='del'>-</div><div class='ctx'>   return sprintf(buf, "%s", "foo");</div><div class='ctx'> }</div><div class='del'>-</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return (mytest());</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='ctx'> </div><div class='del'>-    if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-      echo "Checking for return value of sprintf()... Yes."</div><div class='add'>+    if try $CC -c $CFLAGS $test.c; then</div><div class='add'>+      echo "Checking for return value of sprintf()... Yes." | tee -a configure.log</div><div class='ctx'>     else</div><div class='ctx'>       CFLAGS="$CFLAGS -DHAS_sprintf_void"</div><div class='ctx'>       SFLAGS="$SFLAGS -DHAS_sprintf_void"</div><div class='del'>-      echo "Checking for return value of sprintf()... No."</div><div class='del'>-      echo "  WARNING: apparently sprintf() does not return a value. zlib"</div><div class='del'>-      echo "  can build but will be open to possible string-format security"</div><div class='del'>-      echo "  vulnerabilities."</div><div class='add'>+      echo "Checking for return value of sprintf()... No." | tee -a configure.log</div><div class='add'>+      echo "  WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log</div><div class='add'>+      echo "  can build but will be open to possible string-format security" | tee -a configure.log</div><div class='add'>+      echo "  vulnerabilities." | tee -a configure.log</div><div class='ctx'>     fi</div><div class='ctx'>   fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='add'>+# see if we can hide zlib internal symbols that are linked between separate source files</div><div class='ctx'> if test "$gcc" -eq 1; then</div><div class='add'>+  echo &gt;&gt; configure.log</div><div class='ctx'>   cat &gt; $test.c &lt;&lt;EOF</div><div class='del'>-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 &gt;= 33)</div><div class='del'>-#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))</div><div class='del'>-#else</div><div class='del'>-#  define ZLIB_INTERNAL</div><div class='del'>-#endif</div><div class='add'>+#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))</div><div class='ctx'> int ZLIB_INTERNAL foo;</div><div class='ctx'> int main()</div><div class='ctx'> {</div><div class='ctx'>   return 0;</div><div class='ctx'> }</div><div class='ctx'> EOF</div><div class='del'>-  if test "`($CC -c $CFLAGS $test.c) 2&gt;&amp;1`" = ""; then</div><div class='del'>-    echo "Checking for attribute(visibility) support... Yes."</div><div class='add'>+  if tryboth $CC -c $CFLAGS $test.c; then</div><div class='add'>+    CFLAGS="$CFLAGS -DHAVE_HIDDEN"</div><div class='add'>+    SFLAGS="$SFLAGS -DHAVE_HIDDEN"</div><div class='add'>+    echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log</div><div class='ctx'>   else</div><div class='del'>-    CFLAGS="$CFLAGS -DNO_VIZ"</div><div class='del'>-    SFLAGS="$SFLAGS -DNO_VIZ"</div><div class='del'>-    echo "Checking for attribute(visibility) support... No."</div><div class='add'>+    echo "Checking for attribute(visibility) support... No." | tee -a configure.log</div><div class='ctx'>   fi</div><div class='ctx'> fi</div><div class='ctx'> </div><div class='del'>-CPP=${CPP-"$CC -E"}</div><div class='del'>-case $CFLAGS in</div><div class='del'>-  *ASMV*)</div><div class='del'>-    if test "`$NM $test.o | grep _hello`" = ""; then</div><div class='del'>-      CPP="$CPP -DNO_UNDERLINE"</div><div class='del'>-      echo Checking for underline in external names... No.</div><div class='del'>-    else</div><div class='del'>-      echo Checking for underline in external names... Yes.</div><div class='del'>-    fi ;;</div><div class='del'>-esac</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='ctx'> </div><div class='del'>-rm -f $test.[co] $test $test$shared_ext</div><div class='add'>+# find a four-byte unsiged integer type for crc calculations</div><div class='add'>+cat &gt; $test.c &lt;&lt;EOF</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#define is32(n,t) for(n=1,k=0;n;n&lt;&lt;=1,k++);if(k==32){puts(t);return 0;}</div><div class='add'>+int main() {</div><div class='add'>+    int k;</div><div class='add'>+    unsigned i;</div><div class='add'>+    unsigned long l;</div><div class='add'>+    unsigned short s;</div><div class='add'>+    is32(i, "unsigned")</div><div class='add'>+    is32(l, "unsigned long")</div><div class='add'>+    is32(s, "unsigned short")</div><div class='add'>+    return 1;</div><div class='add'>+}</div><div class='add'>+EOF</div><div class='add'>+Z_U4=""</div><div class='add'>+if try $CC $CFLAGS $test.c -o $test &amp;&amp; Z_U4=`./$test` &amp;&amp; test -n "$Z_U4"; then</div><div class='add'>+  sed &lt; zconf.h "/#define Z_U4/s/\/\* \.\/configure may/#define Z_U4 $Z_U4   \/* .\/configure put the/" &gt; zconf.temp.h</div><div class='add'>+  mv zconf.temp.h zconf.h</div><div class='add'>+  echo "Looking for a four-byte integer type... Found." | tee -a configure.log</div><div class='add'>+else</div><div class='add'>+  echo "Looking for a four-byte integer type... Not found." | tee -a configure.log</div><div class='add'>+fi</div><div class='ctx'> </div><div class='del'>-# udpate Makefile</div><div class='add'>+# clean up files produced by running the compiler and linker</div><div class='add'>+rm -f $test.[co] $test $test$shared_ext $test.gcno</div><div class='add'>+</div><div class='add'>+# show the results in the log</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+echo ALL = $ALL &gt;&gt; configure.log</div><div class='add'>+echo AR = $AR &gt;&gt; configure.log</div><div class='add'>+echo ARFLAGS = $ARFLAGS &gt;&gt; configure.log</div><div class='add'>+echo CC = $CC &gt;&gt; configure.log</div><div class='add'>+echo CFLAGS = $CFLAGS &gt;&gt; configure.log</div><div class='add'>+echo CPP = $CPP &gt;&gt; configure.log</div><div class='add'>+echo EXE = $EXE &gt;&gt; configure.log</div><div class='add'>+echo LDCONFIG = $LDCONFIG &gt;&gt; configure.log</div><div class='add'>+echo LDFLAGS = $LDFLAGS &gt;&gt; configure.log</div><div class='add'>+echo LDSHARED = $LDSHARED &gt;&gt; configure.log</div><div class='add'>+echo LDSHAREDLIBC = $LDSHAREDLIBC &gt;&gt; configure.log</div><div class='add'>+echo OBJC = $OBJC &gt;&gt; configure.log</div><div class='add'>+echo PIC_OBJC = $PIC_OBJC &gt;&gt; configure.log</div><div class='add'>+echo RANLIB = $RANLIB &gt;&gt; configure.log</div><div class='add'>+echo SFLAGS = $SFLAGS &gt;&gt; configure.log</div><div class='add'>+echo SHAREDLIB = $SHAREDLIB &gt;&gt; configure.log</div><div class='add'>+echo SHAREDLIBM = $SHAREDLIBM &gt;&gt; configure.log</div><div class='add'>+echo SHAREDLIBV = $SHAREDLIBV &gt;&gt; configure.log</div><div class='add'>+echo STATICLIB = $STATICLIB &gt;&gt; configure.log</div><div class='add'>+echo TEST = $TEST &gt;&gt; configure.log</div><div class='add'>+echo VER = $VER &gt;&gt; configure.log</div><div class='add'>+echo Z_U4 = $Z_U4 &gt;&gt; configure.log</div><div class='add'>+echo exec_prefix = $exec_prefix &gt;&gt; configure.log</div><div class='add'>+echo includedir = $includedir &gt;&gt; configure.log</div><div class='add'>+echo libdir = $libdir &gt;&gt; configure.log</div><div class='add'>+echo mandir = $mandir &gt;&gt; configure.log</div><div class='add'>+echo prefix = $prefix &gt;&gt; configure.log</div><div class='add'>+echo sharedlibdir = $sharedlibdir &gt;&gt; configure.log</div><div class='add'>+echo uname = $uname &gt;&gt; configure.log</div><div class='add'>+echo -------------------- &gt;&gt; configure.log</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+echo &gt;&gt; configure.log</div><div class='add'>+</div><div class='add'>+# udpate Makefile with the configure results</div><div class='ctx'> sed &lt; Makefile.in "</div><div class='ctx'> /^CC *=/s#=.*#=$CC#</div><div class='ctx'> /^CFLAGS *=/s#=.*#=$CFLAGS#</div><div class='hunk'>@@ -557,7 +774,8 @@ sed &lt; Makefile.in "</div><div class='ctx'> /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#</div><div class='ctx'> /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#</div><div class='ctx'> /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#</div><div class='del'>-/^AR *=/s#=.*#=$AR_RC#</div><div class='add'>+/^AR *=/s#=.*#=$AR#</div><div class='add'>+/^ARFLAGS *=/s#=.*#=$ARFLAGS#</div><div class='ctx'> /^RANLIB *=/s#=.*#=$RANLIB#</div><div class='ctx'> /^LDCONFIG *=/s#=.*#=$LDCONFIG#</div><div class='ctx'> /^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#</div><div class='hunk'>@@ -568,10 +786,13 @@ sed &lt; Makefile.in "</div><div class='ctx'> /^sharedlibdir *=/s#=.*#=$sharedlibdir#</div><div class='ctx'> /^includedir *=/s#=.*#=$includedir#</div><div class='ctx'> /^mandir *=/s#=.*#=$mandir#</div><div class='add'>+/^OBJC *=/s#=.*#= $OBJC#</div><div class='add'>+/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#</div><div class='ctx'> /^all: */s#:.*#: $ALL#</div><div class='ctx'> /^test: */s#:.*#: $TEST#</div><div class='ctx'> " &gt; Makefile</div><div class='ctx'> </div><div class='add'>+# create zlib.pc with the configure results</div><div class='ctx'> sed &lt; zlib.pc.in "</div><div class='ctx'> /^CC *=/s#=.*#=$CC#</div><div class='ctx'> /^CFLAGS *=/s#=.*#=$CFLAGS#</div><div class='hunk'>@@ -581,7 +802,8 @@ sed &lt; zlib.pc.in "</div><div class='ctx'> /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#</div><div class='ctx'> /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#</div><div class='ctx'> /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#</div><div class='del'>-/^AR *=/s#=.*#=$AR_RC#</div><div class='add'>+/^AR *=/s#=.*#=$AR#</div><div class='add'>+/^ARFLAGS *=/s#=.*#=$ARFLAGS#</div><div class='ctx'> /^RANLIB *=/s#=.*#=$RANLIB#</div><div class='ctx'> /^EXE *=/s#=.*#=$EXE#</div><div class='ctx'> /^prefix *=/s#=.*#=$prefix#</div><div class='head'>diff --git a/compat/zlib/contrib/ada/buffer_demo.adb b/compat/zlib/contrib/ada/buffer_demo.adb<br/>index 8fe6e1c..46b8638 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/buffer_demo.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/buffer_demo.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/buffer_demo.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/buffer_demo.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> --</div><div class='del'>---  $Id: buffer_demo.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> --  This demo program provided by Dr Steve Sangwine &lt;sjs@essex.ac.uk&gt;</div><div class='ctx'> --</div><div class='head'>diff --git a/compat/zlib/contrib/ada/mtest.adb b/compat/zlib/contrib/ada/mtest.adb<br/>index 5516952..c4dfd08 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/mtest.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/mtest.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/mtest.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/mtest.adb</a></div><div class='hunk'>@@ -8,7 +8,7 @@</div><div class='ctx'> --  Continuous test for ZLib multithreading. If the test would fail</div><div class='ctx'> --  we should provide thread safe allocation routines for the Z_Stream.</div><div class='ctx'> --</div><div class='del'>---  $Id: mtest.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> with ZLib;</div><div class='ctx'> with Ada.Streams;</div><div class='head'>diff --git a/compat/zlib/contrib/ada/read.adb b/compat/zlib/contrib/ada/read.adb<br/>index 6df6a35..1f2efbf 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/read.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/read.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/read.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/read.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: read.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> --  Test/demo program for the generic read interface.</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/ada/test.adb b/compat/zlib/contrib/ada/test.adb<br/>index 0edf1d6..90773ac 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/test.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/test.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/test.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/test.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: test.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: test.adb,v 1.17 2003/08/12 12:13:30 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> --  The program has a few aims.</div><div class='ctx'> --  1. Test ZLib.Ada95 thick binding functionality.</div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib-streams.adb b/compat/zlib/contrib/ada/zlib-streams.adb<br/>index eac7440..b6497ba 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-streams.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib-streams.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-streams.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-streams.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib-streams.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> with Ada.Unchecked_Deallocation;</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib-streams.ads b/compat/zlib/contrib/ada/zlib-streams.ads<br/>index 68dc0b4..f0193c6b 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-streams.ads?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib-streams.ads</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-streams.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-streams.ads</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib-streams.ads,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> package ZLib.Streams is</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib-thin.adb b/compat/zlib/contrib/ada/zlib-thin.adb<br/>index 7e1f562..0ca4a71 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-thin.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib-thin.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-thin.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-thin.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib-thin.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> package body ZLib.Thin is</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib-thin.ads b/compat/zlib/contrib/ada/zlib-thin.ads<br/>index 7e8e074..d4407eb 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-thin.ads?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib-thin.ads</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib-thin.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib-thin.ads</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib-thin.ads,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> with Interfaces.C.Strings;</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib.adb b/compat/zlib/contrib/ada/zlib.adb<br/>index ec01b1d..8b6fd68 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib.adb?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib.adb</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib.adb?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib.adb</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> --  Open source license information is in the zlib.ads file.  --</div><div class='ctx'> ----------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib.adb,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> with Ada.Exceptions;</div><div class='ctx'> with Ada.Unchecked_Conversion;</div><div class='head'>diff --git a/compat/zlib/contrib/ada/zlib.ads b/compat/zlib/contrib/ada/zlib.ads<br/>index bdf1397..79ffc40 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib.ads?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/ada/zlib.ads</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/ada/zlib.ads?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/ada/zlib.ads</a></div><div class='hunk'>@@ -25,7 +25,7 @@</div><div class='ctx'> --  covered by the  GNU Public License.                                     --</div><div class='ctx'> ------------------------------------------------------------------------------</div><div class='ctx'> </div><div class='del'>---  $Id: zlib.ads,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+--  $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $</div><div class='ctx'> </div><div class='ctx'> with Ada.Streams;</div><div class='ctx'> </div><div class='head'>diff --git a/compat/zlib/contrib/asm586/README.586 b/compat/zlib/contrib/asm586/README.586<br/>deleted file mode 100644<br/>index 6bb78f3..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/asm586/README.586?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/asm586/README.586</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-This is a patched version of zlib modified to use</div><div class='del'>-Pentium-optimized assembly code in the deflation algorithm. The files</div><div class='del'>-changed/added by this patch are:</div><div class='del'>-</div><div class='del'>-README.586</div><div class='del'>-match.S</div><div class='del'>-</div><div class='del'>-The effectiveness of these modifications is a bit marginal, as the the</div><div class='del'>-program's bottleneck seems to be mostly L1-cache contention, for which</div><div class='del'>-there is no real way to work around without rewriting the basic</div><div class='del'>-algorithm. The speedup on average is around 5-10% (which is generally</div><div class='del'>-less than the amount of variance between subsequent executions).</div><div class='del'>-However, when used at level 9 compression, the cache contention can</div><div class='del'>-drop enough for the assembly version to achieve 10-20% speedup (and</div><div class='del'>-sometimes more, depending on the amount of overall redundancy in the</div><div class='del'>-files). Even here, though, cache contention can still be the limiting</div><div class='del'>-factor, depending on the nature of the program using the zlib library.</div><div class='del'>-This may also mean that better improvements will be seen on a Pentium</div><div class='del'>-with MMX, which suffers much less from L1-cache contention, but I have</div><div class='del'>-not yet verified this.</div><div class='del'>-</div><div class='del'>-Note that this code has been tailored for the Pentium in particular,</div><div class='del'>-and will not perform well on the Pentium Pro (due to the use of a</div><div class='del'>-partial register in the inner loop).</div><div class='del'>-</div><div class='del'>-If you are using an assembler other than GNU as, you will have to</div><div class='del'>-translate match.S to use your assembler's syntax. (Have fun.)</div><div class='del'>-</div><div class='del'>-Brian Raiter</div><div class='del'>-breadbox@muppetlabs.com</div><div class='del'>-April, 1998</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Added for zlib 1.1.3:</div><div class='del'>-</div><div class='del'>-The patches come from</div><div class='del'>-http://www.muppetlabs.com/~breadbox/software/assembly.html</div><div class='del'>-</div><div class='del'>-To compile zlib with this asm file, copy match.S to the zlib directory</div><div class='del'>-then do:</div><div class='del'>-</div><div class='del'>-CFLAGS="-O3 -DASMV" ./configure</div><div class='del'>-make OBJA=match.o</div><div class='head'>diff --git a/compat/zlib/contrib/asm586/match.S b/compat/zlib/contrib/asm586/match.S<br/>deleted file mode 100644<br/>index 0368b35..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/asm586/match.S?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/asm586/match.S</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,364 +0,0 @@</div><div class='del'>-/* match.s -- Pentium-optimized version of longest_match()</div><div class='del'>- * Written for zlib 1.1.2</div><div class='del'>- * Copyright (C) 1998 Brian Raiter &lt;breadbox@muppetlabs.com&gt;</div><div class='del'>- *</div><div class='del'>- * This is free software; you can redistribute it and/or modify it</div><div class='del'>- * under the terms of the GNU General Public License.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef NO_UNDERLINE</div><div class='del'>-#define	match_init	_match_init</div><div class='del'>-#define	longest_match	_longest_match</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define	MAX_MATCH	(258)</div><div class='del'>-#define	MIN_MATCH	(3)</div><div class='del'>-#define	MIN_LOOKAHEAD	(MAX_MATCH + MIN_MATCH + 1)</div><div class='del'>-#define	MAX_MATCH_8	((MAX_MATCH + 7) &amp; ~7)</div><div class='del'>-</div><div class='del'>-/* stack frame offsets */</div><div class='del'>-</div><div class='del'>-#define	wmask			0	/* local copy of s-&gt;wmask	*/</div><div class='del'>-#define	window			4	/* local copy of s-&gt;window	*/</div><div class='del'>-#define	windowbestlen		8	/* s-&gt;window + bestlen		*/</div><div class='del'>-#define	chainlenscanend		12	/* high word: current chain len	*/</div><div class='del'>-					/* low word: last bytes sought	*/</div><div class='del'>-#define	scanstart		16	/* first two bytes of string	*/</div><div class='del'>-#define	scanalign		20	/* dword-misalignment of string	*/</div><div class='del'>-#define	nicematch		24	/* a good enough match size	*/</div><div class='del'>-#define	bestlen			28	/* size of best match so far	*/</div><div class='del'>-#define	scan			32	/* ptr to string wanting match	*/</div><div class='del'>-</div><div class='del'>-#define	LocalVarsSize		(36)</div><div class='del'>-/*	saved ebx		36 */</div><div class='del'>-/*	saved edi		40 */</div><div class='del'>-/*	saved esi		44 */</div><div class='del'>-/*	saved ebp		48 */</div><div class='del'>-/*	return address		52 */</div><div class='del'>-#define	deflatestate		56	/* the function arguments	*/</div><div class='del'>-#define	curmatch		60</div><div class='del'>-</div><div class='del'>-/* Offsets for fields in the deflate_state structure. These numbers</div><div class='del'>- * are calculated from the definition of deflate_state, with the</div><div class='del'>- * assumption that the compiler will dword-align the fields. (Thus,</div><div class='del'>- * changing the definition of deflate_state could easily cause this</div><div class='del'>- * program to crash horribly, without so much as a warning at</div><div class='del'>- * compile time. Sigh.)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* All the +zlib1222add offsets are due to the addition of fields</div><div class='del'>- *  in zlib in the deflate_state structure since the asm code was first written</div><div class='del'>- * (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").</div><div class='del'>- * (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").</div><div class='del'>- * if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define zlib1222add		(8)</div><div class='del'>-</div><div class='del'>-#define	dsWSize			(36+zlib1222add)</div><div class='del'>-#define	dsWMask			(44+zlib1222add)</div><div class='del'>-#define	dsWindow		(48+zlib1222add)</div><div class='del'>-#define	dsPrev			(56+zlib1222add)</div><div class='del'>-#define	dsMatchLen		(88+zlib1222add)</div><div class='del'>-#define	dsPrevMatch		(92+zlib1222add)</div><div class='del'>-#define	dsStrStart		(100+zlib1222add)</div><div class='del'>-#define	dsMatchStart		(104+zlib1222add)</div><div class='del'>-#define	dsLookahead		(108+zlib1222add)</div><div class='del'>-#define	dsPrevLen		(112+zlib1222add)</div><div class='del'>-#define	dsMaxChainLen		(116+zlib1222add)</div><div class='del'>-#define	dsGoodMatch		(132+zlib1222add)</div><div class='del'>-#define	dsNiceMatch		(136+zlib1222add)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-.file "match.S"</div><div class='del'>-</div><div class='del'>-.globl	match_init, longest_match</div><div class='del'>-</div><div class='del'>-.text</div><div class='del'>-</div><div class='del'>-/* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */</div><div class='del'>-</div><div class='del'>-longest_match:</div><div class='del'>-</div><div class='del'>-/* Save registers that the compiler may be using, and adjust %esp to	*/</div><div class='del'>-/* make room for our stack frame.					*/</div><div class='del'>-</div><div class='del'>-		pushl	%ebp</div><div class='del'>-		pushl	%edi</div><div class='del'>-		pushl	%esi</div><div class='del'>-		pushl	%ebx</div><div class='del'>-		subl	$LocalVarsSize, %esp</div><div class='del'>-</div><div class='del'>-/* Retrieve the function arguments. %ecx will hold cur_match		*/</div><div class='del'>-/* throughout the entire function. %edx will hold the pointer to the	*/</div><div class='del'>-/* deflate_state structure during the function's setup (before		*/</div><div class='del'>-/* entering the main loop).						*/</div><div class='del'>-</div><div class='del'>-		movl	deflatestate(%esp), %edx</div><div class='del'>-		movl	curmatch(%esp), %ecx</div><div class='del'>-</div><div class='del'>-/* if ((uInt)nice_match &gt; s-&gt;lookahead) nice_match = s-&gt;lookahead;	*/</div><div class='del'>-</div><div class='del'>-		movl	dsNiceMatch(%edx), %eax</div><div class='del'>-		movl	dsLookahead(%edx), %ebx</div><div class='del'>-		cmpl	%eax, %ebx</div><div class='del'>-		jl	LookaheadLess</div><div class='del'>-		movl	%eax, %ebx</div><div class='del'>-LookaheadLess:	movl	%ebx, nicematch(%esp)</div><div class='del'>-</div><div class='del'>-/* register Bytef *scan = s-&gt;window + s-&gt;strstart;			*/</div><div class='del'>-</div><div class='del'>-		movl	dsWindow(%edx), %esi</div><div class='del'>-		movl	%esi, window(%esp)</div><div class='del'>-		movl	dsStrStart(%edx), %ebp</div><div class='del'>-		lea	(%esi,%ebp), %edi</div><div class='del'>-		movl	%edi, scan(%esp)</div><div class='del'>-</div><div class='del'>-/* Determine how many bytes the scan ptr is off from being		*/</div><div class='del'>-/* dword-aligned.							*/</div><div class='del'>-</div><div class='del'>-		movl	%edi, %eax</div><div class='del'>-		negl	%eax</div><div class='del'>-		andl	$3, %eax</div><div class='del'>-		movl	%eax, scanalign(%esp)</div><div class='del'>-</div><div class='del'>-/* IPos limit = s-&gt;strstart &gt; (IPos)MAX_DIST(s) ?			*/</div><div class='del'>-/*     s-&gt;strstart - (IPos)MAX_DIST(s) : NIL;				*/</div><div class='del'>-</div><div class='del'>-		movl	dsWSize(%edx), %eax</div><div class='del'>-		subl	$MIN_LOOKAHEAD, %eax</div><div class='del'>-		subl	%eax, %ebp</div><div class='del'>-		jg	LimitPositive</div><div class='del'>-		xorl	%ebp, %ebp</div><div class='del'>-LimitPositive:</div><div class='del'>-</div><div class='del'>-/* unsigned chain_length = s-&gt;max_chain_length;				*/</div><div class='del'>-/* if (s-&gt;prev_length &gt;= s-&gt;good_match) {				*/</div><div class='del'>-/*     chain_length &gt;&gt;= 2;						*/</div><div class='del'>-/* }									*/</div><div class='del'>-</div><div class='del'>-		movl	dsPrevLen(%edx), %eax</div><div class='del'>-		movl	dsGoodMatch(%edx), %ebx</div><div class='del'>-		cmpl	%ebx, %eax</div><div class='del'>-		movl	dsMaxChainLen(%edx), %ebx</div><div class='del'>-		jl	LastMatchGood</div><div class='del'>-		shrl	$2, %ebx</div><div class='del'>-LastMatchGood:</div><div class='del'>-</div><div class='del'>-/* chainlen is decremented once beforehand so that the function can	*/</div><div class='del'>-/* use the sign flag instead of the zero flag for the exit test.	*/</div><div class='del'>-/* It is then shifted into the high word, to make room for the scanend	*/</div><div class='del'>-/* scanend value, which it will always accompany.			*/</div><div class='del'>-</div><div class='del'>-		decl	%ebx</div><div class='del'>-		shll	$16, %ebx</div><div class='del'>-</div><div class='del'>-/* int best_len = s-&gt;prev_length;					*/</div><div class='del'>-</div><div class='del'>-		movl	dsPrevLen(%edx), %eax</div><div class='del'>-		movl	%eax, bestlen(%esp)</div><div class='del'>-</div><div class='del'>-/* Store the sum of s-&gt;window + best_len in %esi locally, and in %esi.	*/</div><div class='del'>-</div><div class='del'>-		addl	%eax, %esi</div><div class='del'>-		movl	%esi, windowbestlen(%esp)</div><div class='del'>-</div><div class='del'>-/* register ush scan_start = *(ushf*)scan;				*/</div><div class='del'>-/* register ush scan_end   = *(ushf*)(scan+best_len-1);			*/</div><div class='del'>-</div><div class='del'>-		movw	(%edi), %bx</div><div class='del'>-		movw	%bx, scanstart(%esp)</div><div class='del'>-		movw	-1(%edi,%eax), %bx</div><div class='del'>-		movl	%ebx, chainlenscanend(%esp)</div><div class='del'>-</div><div class='del'>-/* Posf *prev = s-&gt;prev;						*/</div><div class='del'>-/* uInt wmask = s-&gt;w_mask;						*/</div><div class='del'>-</div><div class='del'>-		movl	dsPrev(%edx), %edi</div><div class='del'>-		movl	dsWMask(%edx), %edx</div><div class='del'>-		mov	%edx, wmask(%esp)</div><div class='del'>-</div><div class='del'>-/* Jump into the main loop.						*/</div><div class='del'>-</div><div class='del'>-		jmp	LoopEntry</div><div class='del'>-</div><div class='del'>-.balign 16</div><div class='del'>-</div><div class='del'>-/* do {</div><div class='del'>- *     match = s-&gt;window + cur_match;</div><div class='del'>- *     if (*(ushf*)(match+best_len-1) != scan_end ||</div><div class='del'>- *         *(ushf*)match != scan_start) continue;</div><div class='del'>- *     [...]</div><div class='del'>- * } while ((cur_match = prev[cur_match &amp; wmask]) &gt; limit</div><div class='del'>- *          &amp;&amp; --chain_length != 0);</div><div class='del'>- *</div><div class='del'>- * Here is the inner loop of the function. The function will spend the</div><div class='del'>- * majority of its time in this loop, and majority of that time will</div><div class='del'>- * be spent in the first ten instructions.</div><div class='del'>- *</div><div class='del'>- * Within this loop:</div><div class='del'>- * %ebx = chainlenscanend - i.e., ((chainlen &lt;&lt; 16) | scanend)</div><div class='del'>- * %ecx = curmatch</div><div class='del'>- * %edx = curmatch &amp; wmask</div><div class='del'>- * %esi = windowbestlen - i.e., (window + bestlen)</div><div class='del'>- * %edi = prev</div><div class='del'>- * %ebp = limit</div><div class='del'>- *</div><div class='del'>- * Two optimization notes on the choice of instructions:</div><div class='del'>- *</div><div class='del'>- * The first instruction uses a 16-bit address, which costs an extra,</div><div class='del'>- * unpairable cycle. This is cheaper than doing a 32-bit access and</div><div class='del'>- * zeroing the high word, due to the 3-cycle misalignment penalty which</div><div class='del'>- * would occur half the time. This also turns out to be cheaper than</div><div class='del'>- * doing two separate 8-bit accesses, as the memory is so rarely in the</div><div class='del'>- * L1 cache.</div><div class='del'>- *</div><div class='del'>- * The window buffer, however, apparently spends a lot of time in the</div><div class='del'>- * cache, and so it is faster to retrieve the word at the end of the</div><div class='del'>- * match string with two 8-bit loads. The instructions that test the</div><div class='del'>- * word at the beginning of the match string, however, are executed</div><div class='del'>- * much less frequently, and there it was cheaper to use 16-bit</div><div class='del'>- * instructions, which avoided the necessity of saving off and</div><div class='del'>- * subsequently reloading one of the other registers.</div><div class='del'>- */</div><div class='del'>-LookupLoop:</div><div class='del'>-							/* 1 U &amp; V  */</div><div class='del'>-		movw	(%edi,%edx,2), %cx		/* 2 U pipe */</div><div class='del'>-		movl	wmask(%esp), %edx		/* 2 V pipe */</div><div class='del'>-		cmpl	%ebp, %ecx			/* 3 U pipe */</div><div class='del'>-		jbe	LeaveNow			/* 3 V pipe */</div><div class='del'>-		subl	$0x00010000, %ebx		/* 4 U pipe */</div><div class='del'>-		js	LeaveNow			/* 4 V pipe */</div><div class='del'>-LoopEntry:	movb	-1(%esi,%ecx), %al		/* 5 U pipe */</div><div class='del'>-		andl	%ecx, %edx			/* 5 V pipe */</div><div class='del'>-		cmpb	%bl, %al			/* 6 U pipe */</div><div class='del'>-		jnz	LookupLoop			/* 6 V pipe */</div><div class='del'>-		movb	(%esi,%ecx), %ah</div><div class='del'>-		cmpb	%bh, %ah</div><div class='del'>-		jnz	LookupLoop</div><div class='del'>-		movl	window(%esp), %eax</div><div class='del'>-		movw	(%eax,%ecx), %ax</div><div class='del'>-		cmpw	scanstart(%esp), %ax</div><div class='del'>-		jnz	LookupLoop</div><div class='del'>-</div><div class='del'>-/* Store the current value of chainlen.					*/</div><div class='del'>-</div><div class='del'>-		movl	%ebx, chainlenscanend(%esp)</div><div class='del'>-</div><div class='del'>-/* Point %edi to the string under scrutiny, and %esi to the string we	*/</div><div class='del'>-/* are hoping to match it up with. In actuality, %esi and %edi are	*/</div><div class='del'>-/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is	*/</div><div class='del'>-/* initialized to -(MAX_MATCH_8 - scanalign).				*/</div><div class='del'>-</div><div class='del'>-		movl	window(%esp), %esi</div><div class='del'>-		movl	scan(%esp), %edi</div><div class='del'>-		addl	%ecx, %esi</div><div class='del'>-		movl	scanalign(%esp), %eax</div><div class='del'>-		movl	$(-MAX_MATCH_8), %edx</div><div class='del'>-		lea	MAX_MATCH_8(%edi,%eax), %edi</div><div class='del'>-		lea	MAX_MATCH_8(%esi,%eax), %esi</div><div class='del'>-</div><div class='del'>-/* Test the strings for equality, 8 bytes at a time. At the end,</div><div class='del'>- * adjust %edx so that it is offset to the exact byte that mismatched.</div><div class='del'>- *</div><div class='del'>- * We already know at this point that the first three bytes of the</div><div class='del'>- * strings match each other, and they can be safely passed over before</div><div class='del'>- * starting the compare loop. So what this code does is skip over 0-3</div><div class='del'>- * bytes, as much as necessary in order to dword-align the %edi</div><div class='del'>- * pointer. (%esi will still be misaligned three times out of four.)</div><div class='del'>- *</div><div class='del'>- * It should be confessed that this loop usually does not represent</div><div class='del'>- * much of the total running time. Replacing it with a more</div><div class='del'>- * straightforward "rep cmpsb" would not drastically degrade</div><div class='del'>- * performance.</div><div class='del'>- */</div><div class='del'>-LoopCmps:</div><div class='del'>-		movl	(%esi,%edx), %eax</div><div class='del'>-		movl	(%edi,%edx), %ebx</div><div class='del'>-		xorl	%ebx, %eax</div><div class='del'>-		jnz	LeaveLoopCmps</div><div class='del'>-		movl	4(%esi,%edx), %eax</div><div class='del'>-		movl	4(%edi,%edx), %ebx</div><div class='del'>-		xorl	%ebx, %eax</div><div class='del'>-		jnz	LeaveLoopCmps4</div><div class='del'>-		addl	$8, %edx</div><div class='del'>-		jnz	LoopCmps</div><div class='del'>-		jmp	LenMaximum</div><div class='del'>-LeaveLoopCmps4:	addl	$4, %edx</div><div class='del'>-LeaveLoopCmps:	testl	$0x0000FFFF, %eax</div><div class='del'>-		jnz	LenLower</div><div class='del'>-		addl	$2, %edx</div><div class='del'>-		shrl	$16, %eax</div><div class='del'>-LenLower:	subb	$1, %al</div><div class='del'>-		adcl	$0, %edx</div><div class='del'>-</div><div class='del'>-/* Calculate the length of the match. If it is longer than MAX_MATCH,	*/</div><div class='del'>-/* then automatically accept it as the best possible match and leave.	*/</div><div class='del'>-</div><div class='del'>-		lea	(%edi,%edx), %eax</div><div class='del'>-		movl	scan(%esp), %edi</div><div class='del'>-		subl	%edi, %eax</div><div class='del'>-		cmpl	$MAX_MATCH, %eax</div><div class='del'>-		jge	LenMaximum</div><div class='del'>-</div><div class='del'>-/* If the length of the match is not longer than the best match we	*/</div><div class='del'>-/* have so far, then forget it and return to the lookup loop.		*/</div><div class='del'>-</div><div class='del'>-		movl	deflatestate(%esp), %edx</div><div class='del'>-		movl	bestlen(%esp), %ebx</div><div class='del'>-		cmpl	%ebx, %eax</div><div class='del'>-		jg	LongerMatch</div><div class='del'>-		movl	chainlenscanend(%esp), %ebx</div><div class='del'>-		movl	windowbestlen(%esp), %esi</div><div class='del'>-		movl	dsPrev(%edx), %edi</div><div class='del'>-		movl	wmask(%esp), %edx</div><div class='del'>-		andl	%ecx, %edx</div><div class='del'>-		jmp	LookupLoop</div><div class='del'>-</div><div class='del'>-/*         s-&gt;match_start = cur_match;					*/</div><div class='del'>-/*         best_len = len;						*/</div><div class='del'>-/*         if (len &gt;= nice_match) break;				*/</div><div class='del'>-/*         scan_end = *(ushf*)(scan+best_len-1);			*/</div><div class='del'>-</div><div class='del'>-LongerMatch:	movl	nicematch(%esp), %ebx</div><div class='del'>-		movl	%eax, bestlen(%esp)</div><div class='del'>-		movl	%ecx, dsMatchStart(%edx)</div><div class='del'>-		cmpl	%ebx, %eax</div><div class='del'>-		jge	LeaveNow</div><div class='del'>-		movl	window(%esp), %esi</div><div class='del'>-		addl	%eax, %esi</div><div class='del'>-		movl	%esi, windowbestlen(%esp)</div><div class='del'>-		movl	chainlenscanend(%esp), %ebx</div><div class='del'>-		movw	-1(%edi,%eax), %bx</div><div class='del'>-		movl	dsPrev(%edx), %edi</div><div class='del'>-		movl	%ebx, chainlenscanend(%esp)</div><div class='del'>-		movl	wmask(%esp), %edx</div><div class='del'>-		andl	%ecx, %edx</div><div class='del'>-		jmp	LookupLoop</div><div class='del'>-</div><div class='del'>-/* Accept the current string, with the maximum possible length.		*/</div><div class='del'>-</div><div class='del'>-LenMaximum:	movl	deflatestate(%esp), %edx</div><div class='del'>-		movl	$MAX_MATCH, bestlen(%esp)</div><div class='del'>-		movl	%ecx, dsMatchStart(%edx)</div><div class='del'>-</div><div class='del'>-/* if ((uInt)best_len &lt;= s-&gt;lookahead) return (uInt)best_len;		*/</div><div class='del'>-/* return s-&gt;lookahead;							*/</div><div class='del'>-</div><div class='del'>-LeaveNow:</div><div class='del'>-		movl	deflatestate(%esp), %edx</div><div class='del'>-		movl	bestlen(%esp), %ebx</div><div class='del'>-		movl	dsLookahead(%edx), %eax</div><div class='del'>-		cmpl	%eax, %ebx</div><div class='del'>-		jg	LookaheadRet</div><div class='del'>-		movl	%ebx, %eax</div><div class='del'>-LookaheadRet:</div><div class='del'>-</div><div class='del'>-/* Restore the stack and return from whence we came.			*/</div><div class='del'>-</div><div class='del'>-		addl	$LocalVarsSize, %esp</div><div class='del'>-		popl	%ebx</div><div class='del'>-		popl	%esi</div><div class='del'>-		popl	%edi</div><div class='del'>-		popl	%ebp</div><div class='del'>-match_init:	ret</div><div class='head'>diff --git a/compat/zlib/contrib/asm686/match.S b/compat/zlib/contrib/asm686/match.S<br/>index 06817e1..fa42109 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/asm686/match.S?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/asm686/match.S</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/asm686/match.S?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/asm686/match.S</a></div><div class='hunk'>@@ -83,17 +83,25 @@</div><div class='ctx'> .text</div><div class='ctx'> </div><div class='ctx'> /* uInt longest_match(deflate_state *deflatestate, IPos curmatch) */</div><div class='add'>+.cfi_sections	.debug_frame</div><div class='ctx'> </div><div class='ctx'> longest_match:</div><div class='ctx'> </div><div class='add'>+.cfi_startproc</div><div class='ctx'> /* Save registers that the compiler may be using, and adjust %esp to	*/</div><div class='ctx'> /* make room for our stack frame.					*/</div><div class='ctx'> </div><div class='ctx'> 		pushl	%ebp</div><div class='add'>+		.cfi_def_cfa_offset 8</div><div class='add'>+		.cfi_offset ebp, -8</div><div class='ctx'> 		pushl	%edi</div><div class='add'>+		.cfi_def_cfa_offset 12</div><div class='ctx'> 		pushl	%esi</div><div class='add'>+		.cfi_def_cfa_offset 16</div><div class='ctx'> 		pushl	%ebx</div><div class='add'>+		.cfi_def_cfa_offset 20</div><div class='ctx'> 		subl	$LocalVarsSize, %esp</div><div class='add'>+		.cfi_def_cfa_offset LocalVarsSize+20</div><div class='ctx'> </div><div class='ctx'> /* Retrieve the function arguments. %ecx will hold cur_match		*/</div><div class='ctx'> /* throughout the entire function. %edx will hold the pointer to the	*/</div><div class='hunk'>@@ -108,7 +116,7 @@ longest_match:</div><div class='ctx'> /* if (s-&gt;prev_length &gt;= s-&gt;good_match) {				*/</div><div class='ctx'> /*     chain_length &gt;&gt;= 2;						*/</div><div class='ctx'> /* }									*/</div><div class='del'>-</div><div class='add'>+ </div><div class='ctx'> 		movl	dsPrevLen(%edx), %eax</div><div class='ctx'> 		movl	dsGoodMatch(%edx), %ebx</div><div class='ctx'> 		cmpl	%ebx, %eax</div><div class='hunk'>@@ -336,8 +344,14 @@ LookaheadRet:</div><div class='ctx'> /* Restore the stack and return from whence we came.			*/</div><div class='ctx'> </div><div class='ctx'> 		addl	$LocalVarsSize, %esp</div><div class='add'>+		.cfi_def_cfa_offset 20</div><div class='ctx'> 		popl	%ebx</div><div class='add'>+		.cfi_def_cfa_offset 16</div><div class='ctx'> 		popl	%esi</div><div class='add'>+		.cfi_def_cfa_offset 12</div><div class='ctx'> 		popl	%edi</div><div class='add'>+		.cfi_def_cfa_offset 8</div><div class='ctx'> 		popl	%ebp</div><div class='add'>+		.cfi_def_cfa_offset 4</div><div class='add'>+.cfi_endproc</div><div class='ctx'> match_init:	ret</div><div class='head'>diff --git a/compat/zlib/contrib/delphi/ZLib.pas b/compat/zlib/contrib/delphi/ZLib.pas<br/>index 0d86fb5..f24bb3e 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/delphi/ZLib.pas?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/delphi/ZLib.pas</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/delphi/ZLib.pas?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/delphi/ZLib.pas</a></div><div class='hunk'>@@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;</div><div class='ctx'>   const OutBuf: Pointer; BufSize: Integer);</div><div class='ctx'> </div><div class='ctx'> const</div><div class='del'>-  zlib_version = '1.2.5';</div><div class='add'>+  zlib_version = '1.2.7';</div><div class='ctx'> </div><div class='ctx'> type</div><div class='ctx'>   EZlibError = class(Exception);</div><div class='head'>diff --git a/compat/zlib/contrib/delphi/zlibd32.mak b/compat/zlib/contrib/delphi/zlibd32.mak<br/>index 0d0699a..9bb00b7 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/delphi/zlibd32.mak?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/delphi/zlibd32.mak</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/delphi/zlibd32.mak?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/delphi/zlibd32.mak</a></div><div class='hunk'>@@ -63,9 +63,9 @@ uncompr.obj: uncompr.c zlib.h zconf.h</div><div class='ctx'> </div><div class='ctx'> zutil.obj: zutil.c zutil.h zlib.h zconf.h</div><div class='ctx'> </div><div class='del'>-example.obj: example.c zlib.h zconf.h</div><div class='add'>+example.obj: test/example.c zlib.h zconf.h</div><div class='ctx'> </div><div class='del'>-minigzip.obj: minigzip.c zlib.h zconf.h</div><div class='add'>+minigzip.obj: test/minigzip.c zlib.h zconf.h</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> # For the sake of the old Borland make,</div><div class='head'>diff --git a/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs<br/>index 3bbcc8c..1090288 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs</a></div><div class='hunk'>@@ -156,7 +156,7 @@ namespace DotZLibTests</div><div class='ctx'>         public void Info_Version()
</div><div class='ctx'>         {
</div><div class='ctx'>             Info info = new Info();
</div><div class='del'>-            Assert.AreEqual("1.2.5", Info.Version);
</div><div class='add'>+            Assert.AreEqual("1.2.7", Info.Version);
</div><div class='ctx'>             Assert.AreEqual(32, info.SizeOfUInt);
</div><div class='ctx'>             Assert.AreEqual(32, info.SizeOfULong);
</div><div class='ctx'>             Assert.AreEqual(32, info.SizeOfPointer);
</div><div class='head'>diff --git a/compat/zlib/contrib/infback9/inftree9.c b/compat/zlib/contrib/infback9/inftree9.c<br/>index 306c5f1..5a0b328 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/infback9/inftree9.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/infback9/inftree9.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/infback9/inftree9.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/infback9/inftree9.c</a></div><div class='hunk'>@@ -1,5 +1,5 @@</div><div class='ctx'> /* inftree9.c -- generate Huffman trees for efficient decoding</div><div class='del'>- * Copyright (C) 1995-2010 Mark Adler</div><div class='add'>+ * Copyright (C) 1995-2012 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in zlib.h</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='hunk'>@@ -9,7 +9,7 @@</div><div class='ctx'> #define MAXBITS 15</div><div class='ctx'> </div><div class='ctx'> const char inflate9_copyright[] =</div><div class='del'>-   " inflate9 1.2.5 Copyright 1995-2010 Mark Adler ";</div><div class='add'>+   " inflate9 1.2.7 Copyright 1995-2012 Mark Adler ";</div><div class='ctx'> /*</div><div class='ctx'>   If you use the zlib library in a product, an acknowledgment is welcome</div><div class='ctx'>   in the documentation of your product. If for some reason you cannot</div><div class='hunk'>@@ -64,7 +64,7 @@ unsigned short FAR *work;</div><div class='ctx'>     static const unsigned short lext[31] = { /* Length codes 257..285 extra */</div><div class='ctx'>         128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,</div><div class='ctx'>         130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,</div><div class='del'>-        133, 133, 133, 133, 144, 73, 195};</div><div class='add'>+        133, 133, 133, 133, 144, 78, 68};</div><div class='ctx'>     static const unsigned short dbase[32] = { /* Distance codes 0..31 base */</div><div class='ctx'>         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,</div><div class='ctx'>         65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,</div><div class='head'>diff --git a/compat/zlib/contrib/iostream2/zstream.h b/compat/zlib/contrib/iostream2/zstream.h<br/>index ba5e328..43d2332 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/iostream2/zstream.h?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/iostream2/zstream.h</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/iostream2/zstream.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/iostream2/zstream.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * zstream.h - C++ interface to the 'zlib' general purpose compression library</div><div class='del'>- * $Id: zstream.h,v 1.3 2010/04/20 14:50:10 nijtmans Exp $</div><div class='add'>+ * $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;strstream.h&gt;</div><div class='head'>diff --git a/compat/zlib/contrib/masm686/match.asm b/compat/zlib/contrib/masm686/match.asm<br/>deleted file mode 100644<br/>index 4b03a71..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masm686/match.asm?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masm686/match.asm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,413 +0,0 @@</div><div class='del'>-
</div><div class='del'>-; match.asm -- Pentium-Pro optimized version of longest_match()
</div><div class='del'>-;
</div><div class='del'>-; Updated for zlib 1.1.3 and converted to MASM 6.1x
</div><div class='del'>-; Copyright (C) 2000 Dan Higdon &lt;hdan@kinesoft.com&gt;
</div><div class='del'>-;                    and Chuck Walbourn &lt;chuckw@kinesoft.com&gt;
</div><div class='del'>-; Corrections by Cosmin Truta &lt;cosmint@cs.ubbcluj.ro&gt;
</div><div class='del'>-;
</div><div class='del'>-; This is free software; you can redistribute it and/or modify it
</div><div class='del'>-; under the terms of the GNU General Public License.
</div><div class='del'>-
</div><div class='del'>-; Based on match.S
</div><div class='del'>-; Written for zlib 1.1.2
</div><div class='del'>-; Copyright (C) 1998 Brian Raiter &lt;breadbox@muppetlabs.com&gt;
</div><div class='del'>-;
</div><div class='del'>-; Modified by Gilles Vollant (2005) for add gzhead and gzindex
</div><div class='del'>-
</div><div class='del'>-	.686P
</div><div class='del'>-	.MODEL	FLAT
</div><div class='del'>-
</div><div class='del'>-;===========================================================================
</div><div class='del'>-; EQUATES
</div><div class='del'>-;===========================================================================
</div><div class='del'>-
</div><div class='del'>-MAX_MATCH	EQU 258
</div><div class='del'>-MIN_MATCH	EQU 3
</div><div class='del'>-MIN_LOOKAHEAD	EQU (MAX_MATCH + MIN_MATCH + 1)
</div><div class='del'>-MAX_MATCH_8	EQU ((MAX_MATCH + 7) AND (NOT 7))
</div><div class='del'>-
</div><div class='del'>-;===========================================================================
</div><div class='del'>-; STRUCTURES
</div><div class='del'>-;===========================================================================
</div><div class='del'>-
</div><div class='del'>-; This STRUCT assumes a 4-byte alignment
</div><div class='del'>-
</div><div class='del'>-DEFLATE_STATE	STRUCT
</div><div class='del'>-ds_strm			dd ?
</div><div class='del'>-ds_status		dd ?
</div><div class='del'>-ds_pending_buf		dd ?
</div><div class='del'>-ds_pending_buf_size	dd ?
</div><div class='del'>-ds_pending_out		dd ?
</div><div class='del'>-ds_pending		dd ?
</div><div class='del'>-ds_wrap			dd ?
</div><div class='del'>-; gzhead and gzindex are added in zlib 1.2.2.2 (see deflate.h)
</div><div class='del'>-ds_gzhead               dd ?
</div><div class='del'>-ds_gzindex              dd ?
</div><div class='del'>-ds_data_type		db ?
</div><div class='del'>-ds_method		db ?
</div><div class='del'>-			db ?	; padding
</div><div class='del'>-			db ?	; padding
</div><div class='del'>-ds_last_flush		dd ?
</div><div class='del'>-ds_w_size		dd ?	; used
</div><div class='del'>-ds_w_bits		dd ?
</div><div class='del'>-ds_w_mask		dd ?	; used
</div><div class='del'>-ds_window		dd ?	; used
</div><div class='del'>-ds_window_size		dd ?
</div><div class='del'>-ds_prev			dd ?	; used
</div><div class='del'>-ds_head			dd ?
</div><div class='del'>-ds_ins_h		dd ?
</div><div class='del'>-ds_hash_size		dd ?
</div><div class='del'>-ds_hash_bits		dd ?
</div><div class='del'>-ds_hash_mask		dd ?
</div><div class='del'>-ds_hash_shift		dd ?
</div><div class='del'>-ds_block_start		dd ?
</div><div class='del'>-ds_match_length		dd ?	; used
</div><div class='del'>-ds_prev_match		dd ?	; used
</div><div class='del'>-ds_match_available	dd ?
</div><div class='del'>-ds_strstart		dd ?	; used
</div><div class='del'>-ds_match_start		dd ?	; used
</div><div class='del'>-ds_lookahead		dd ?	; used
</div><div class='del'>-ds_prev_length		dd ?	; used
</div><div class='del'>-ds_max_chain_length	dd ?	; used
</div><div class='del'>-ds_max_laxy_match	dd ?
</div><div class='del'>-ds_level		dd ?
</div><div class='del'>-ds_strategy		dd ?
</div><div class='del'>-ds_good_match		dd ?	; used
</div><div class='del'>-ds_nice_match		dd ?	; used
</div><div class='del'>-
</div><div class='del'>-; Don't need anymore of the struct for match
</div><div class='del'>-DEFLATE_STATE	ENDS
</div><div class='del'>-
</div><div class='del'>-;===========================================================================
</div><div class='del'>-; CODE
</div><div class='del'>-;===========================================================================
</div><div class='del'>-_TEXT	SEGMENT
</div><div class='del'>-
</div><div class='del'>-;---------------------------------------------------------------------------
</div><div class='del'>-; match_init
</div><div class='del'>-;---------------------------------------------------------------------------
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-PUBLIC	_match_init
</div><div class='del'>-_match_init	PROC
</div><div class='del'>-	; no initialization needed
</div><div class='del'>-	ret
</div><div class='del'>-_match_init	ENDP
</div><div class='del'>-
</div><div class='del'>-;---------------------------------------------------------------------------
</div><div class='del'>-; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
</div><div class='del'>-;---------------------------------------------------------------------------
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-
</div><div class='del'>-PUBLIC	_longest_match
</div><div class='del'>-_longest_match	PROC
</div><div class='del'>-
</div><div class='del'>-; Since this code uses EBP for a scratch register, the stack frame must
</div><div class='del'>-; be manually constructed and referenced relative to the ESP register.
</div><div class='del'>-
</div><div class='del'>-; Stack image
</div><div class='del'>-; Variables
</div><div class='del'>-chainlenwmask	=  0	; high word: current chain len
</div><div class='del'>-			; low word: s-&gt;wmask
</div><div class='del'>-window		=  4	; local copy of s-&gt;window
</div><div class='del'>-windowbestlen	=  8	; s-&gt;window + bestlen
</div><div class='del'>-scanend		= 12	; last two bytes of string
</div><div class='del'>-scanstart	= 16	; first two bytes of string
</div><div class='del'>-scanalign	= 20	; dword-misalignment of string
</div><div class='del'>-nicematch	= 24	; a good enough match size
</div><div class='del'>-bestlen		= 28	; size of best match so far
</div><div class='del'>-scan		= 32	; ptr to string wanting match
</div><div class='del'>-varsize		= 36	; number of bytes (also offset to last saved register)
</div><div class='del'>-
</div><div class='del'>-; Saved Registers (actually pushed into place)
</div><div class='del'>-ebx_save	= 36
</div><div class='del'>-edi_save	= 40
</div><div class='del'>-esi_save	= 44
</div><div class='del'>-ebp_save	= 48
</div><div class='del'>-
</div><div class='del'>-; Parameters
</div><div class='del'>-retaddr		= 52
</div><div class='del'>-deflatestate	= 56
</div><div class='del'>-curmatch	= 60
</div><div class='del'>-
</div><div class='del'>-; Save registers that the compiler may be using
</div><div class='del'>-	push	ebp
</div><div class='del'>-	push	edi
</div><div class='del'>-	push	esi
</div><div class='del'>-	push	ebx
</div><div class='del'>-
</div><div class='del'>-; Allocate local variable space
</div><div class='del'>-	sub	esp,varsize
</div><div class='del'>-
</div><div class='del'>-; Retrieve the function arguments. ecx will hold cur_match
</div><div class='del'>-; throughout the entire function. edx will hold the pointer to the
</div><div class='del'>-; deflate_state structure during the function's setup (before
</div><div class='del'>-; entering the main loop).
</div><div class='del'>-
</div><div class='del'>-	mov	edx, [esp+deflatestate]
</div><div class='del'>-ASSUME	edx:PTR DEFLATE_STATE
</div><div class='del'>-
</div><div class='del'>-	mov	ecx, [esp+curmatch]
</div><div class='del'>-
</div><div class='del'>-; uInt wmask = s-&gt;w_mask;
</div><div class='del'>-; unsigned chain_length = s-&gt;max_chain_length;
</div><div class='del'>-; if (s-&gt;prev_length &gt;= s-&gt;good_match) {
</div><div class='del'>-;     chain_length &gt;&gt;= 2;
</div><div class='del'>-; }
</div><div class='del'>-
</div><div class='del'>-	mov	eax, [edx].ds_prev_length
</div><div class='del'>-	mov	ebx, [edx].ds_good_match
</div><div class='del'>-	cmp	eax, ebx
</div><div class='del'>-	mov	eax, [edx].ds_w_mask
</div><div class='del'>-	mov	ebx, [edx].ds_max_chain_length
</div><div class='del'>-	jl	SHORT LastMatchGood
</div><div class='del'>-	shr	ebx, 2
</div><div class='del'>-LastMatchGood:
</div><div class='del'>-
</div><div class='del'>-; chainlen is decremented once beforehand so that the function can
</div><div class='del'>-; use the sign flag instead of the zero flag for the exit test.
</div><div class='del'>-; It is then shifted into the high word, to make room for the wmask
</div><div class='del'>-; value, which it will always accompany.
</div><div class='del'>-
</div><div class='del'>-	dec	ebx
</div><div class='del'>-	shl	ebx, 16
</div><div class='del'>-	or	ebx, eax
</div><div class='del'>-	mov	[esp+chainlenwmask], ebx
</div><div class='del'>-
</div><div class='del'>-; if ((uInt)nice_match &gt; s-&gt;lookahead) nice_match = s-&gt;lookahead;
</div><div class='del'>-
</div><div class='del'>-	mov	eax, [edx].ds_nice_match
</div><div class='del'>-	mov	ebx, [edx].ds_lookahead
</div><div class='del'>-	cmp	ebx, eax
</div><div class='del'>-	jl	SHORT LookaheadLess
</div><div class='del'>-	mov	ebx, eax
</div><div class='del'>-LookaheadLess:
</div><div class='del'>-	mov	[esp+nicematch], ebx
</div><div class='del'>-
</div><div class='del'>-;/* register Bytef *scan = s-&gt;window + s-&gt;strstart;                     */
</div><div class='del'>-
</div><div class='del'>-	mov	esi, [edx].ds_window
</div><div class='del'>-	mov	[esp+window], esi
</div><div class='del'>-	mov	ebp, [edx].ds_strstart
</div><div class='del'>-	lea	edi, [esi+ebp]
</div><div class='del'>-	mov	[esp+scan],edi
</div><div class='del'>-
</div><div class='del'>-;/* Determine how many bytes the scan ptr is off from being             */
</div><div class='del'>-;/* dword-aligned.                                                      */
</div><div class='del'>-
</div><div class='del'>-	mov	eax, edi
</div><div class='del'>-	neg	eax
</div><div class='del'>-	and	eax, 3
</div><div class='del'>-	mov	[esp+scanalign], eax
</div><div class='del'>-
</div><div class='del'>-;/* IPos limit = s-&gt;strstart &gt; (IPos)MAX_DIST(s) ?                      */
</div><div class='del'>-;/*     s-&gt;strstart - (IPos)MAX_DIST(s) : NIL;                          */
</div><div class='del'>-
</div><div class='del'>-	mov	eax, [edx].ds_w_size
</div><div class='del'>-	sub	eax, MIN_LOOKAHEAD
</div><div class='del'>-	sub	ebp, eax
</div><div class='del'>-	jg	SHORT LimitPositive
</div><div class='del'>-	xor	ebp, ebp
</div><div class='del'>-LimitPositive:
</div><div class='del'>-
</div><div class='del'>-;/* int best_len = s-&gt;prev_length;                                      */
</div><div class='del'>-
</div><div class='del'>-	mov	eax, [edx].ds_prev_length
</div><div class='del'>-	mov	[esp+bestlen], eax
</div><div class='del'>-
</div><div class='del'>-;/* Store the sum of s-&gt;window + best_len in %esi locally, and in %esi. */
</div><div class='del'>-
</div><div class='del'>-	add	esi, eax
</div><div class='del'>-	mov	[esp+windowbestlen], esi
</div><div class='del'>-
</div><div class='del'>-;/* register ush scan_start = *(ushf*)scan;                             */
</div><div class='del'>-;/* register ush scan_end   = *(ushf*)(scan+best_len-1);                */
</div><div class='del'>-;/* Posf *prev = s-&gt;prev;                                               */
</div><div class='del'>-
</div><div class='del'>-	movzx	ebx, WORD PTR[edi]
</div><div class='del'>-	mov	[esp+scanstart], ebx
</div><div class='del'>-	movzx	ebx, WORD PTR[eax+edi-1]
</div><div class='del'>-	mov	[esp+scanend], ebx
</div><div class='del'>-	mov	edi, [edx].ds_prev
</div><div class='del'>-
</div><div class='del'>-;/* Jump into the main loop.                                            */
</div><div class='del'>-
</div><div class='del'>-	mov	edx, [esp+chainlenwmask]
</div><div class='del'>-	jmp	SHORT LoopEntry
</div><div class='del'>-
</div><div class='del'>-;/* do {
</div><div class='del'>-; *     match = s-&gt;window + cur_match;
</div><div class='del'>-; *     if (*(ushf*)(match+best_len-1) != scan_end ||
</div><div class='del'>-; *         *(ushf*)match != scan_start) continue;
</div><div class='del'>-; *     [...]
</div><div class='del'>-; * } while ((cur_match = prev[cur_match &amp; wmask]) &gt; limit
</div><div class='del'>-; *          &amp;&amp; --chain_length != 0);
</div><div class='del'>-; *
</div><div class='del'>-; * Here is the inner loop of the function. The function will spend the
</div><div class='del'>-; * majority of its time in this loop, and majority of that time will
</div><div class='del'>-; * be spent in the first ten instructions.
</div><div class='del'>-; *
</div><div class='del'>-; * Within this loop:
</div><div class='del'>-; * %ebx = scanend
</div><div class='del'>-; * %ecx = curmatch
</div><div class='del'>-; * %edx = chainlenwmask - i.e., ((chainlen &lt;&lt; 16) | wmask)
</div><div class='del'>-; * %esi = windowbestlen - i.e., (window + bestlen)
</div><div class='del'>-; * %edi = prev
</div><div class='del'>-; * %ebp = limit
</div><div class='del'>-; */
</div><div class='del'>-
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-LookupLoop:
</div><div class='del'>-	and	ecx, edx
</div><div class='del'>-	movzx	ecx, WORD PTR[edi+ecx*2]
</div><div class='del'>-	cmp	ecx, ebp
</div><div class='del'>-	jbe	LeaveNow
</div><div class='del'>-	sub	edx, 000010000H
</div><div class='del'>-	js	LeaveNow
</div><div class='del'>-
</div><div class='del'>-LoopEntry:
</div><div class='del'>-	movzx	eax, WORD PTR[esi+ecx-1]
</div><div class='del'>-	cmp	eax, ebx
</div><div class='del'>-	jnz	SHORT LookupLoop
</div><div class='del'>-
</div><div class='del'>-	mov	eax, [esp+window]
</div><div class='del'>-	movzx	eax, WORD PTR[eax+ecx]
</div><div class='del'>-	cmp	eax, [esp+scanstart]
</div><div class='del'>-	jnz	SHORT LookupLoop
</div><div class='del'>-
</div><div class='del'>-;/* Store the current value of chainlen.                                */
</div><div class='del'>-
</div><div class='del'>-	mov	[esp+chainlenwmask], edx
</div><div class='del'>-
</div><div class='del'>-;/* Point %edi to the string under scrutiny, and %esi to the string we  */
</div><div class='del'>-;/* are hoping to match it up with. In actuality, %esi and %edi are     */
</div><div class='del'>-;/* both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and %edx is     */
</div><div class='del'>-;/* initialized to -(MAX_MATCH_8 - scanalign).                          */
</div><div class='del'>-
</div><div class='del'>-	mov	esi, [esp+window]
</div><div class='del'>-	mov	edi, [esp+scan]
</div><div class='del'>-	add	esi, ecx
</div><div class='del'>-	mov	eax, [esp+scanalign]
</div><div class='del'>-	mov	edx, -MAX_MATCH_8
</div><div class='del'>-	lea	edi, [edi+eax+MAX_MATCH_8]
</div><div class='del'>-	lea	esi, [esi+eax+MAX_MATCH_8]
</div><div class='del'>-
</div><div class='del'>-;/* Test the strings for equality, 8 bytes at a time. At the end,
</div><div class='del'>-; * adjust %edx so that it is offset to the exact byte that mismatched.
</div><div class='del'>-; *
</div><div class='del'>-; * We already know at this point that the first three bytes of the
</div><div class='del'>-; * strings match each other, and they can be safely passed over before
</div><div class='del'>-; * starting the compare loop. So what this code does is skip over 0-3
</div><div class='del'>-; * bytes, as much as necessary in order to dword-align the %edi
</div><div class='del'>-; * pointer. (%esi will still be misaligned three times out of four.)
</div><div class='del'>-; *
</div><div class='del'>-; * It should be confessed that this loop usually does not represent
</div><div class='del'>-; * much of the total running time. Replacing it with a more
</div><div class='del'>-; * straightforward "rep cmpsb" would not drastically degrade
</div><div class='del'>-; * performance.
</div><div class='del'>-; */
</div><div class='del'>-
</div><div class='del'>-LoopCmps:
</div><div class='del'>-	mov	eax, DWORD PTR[esi+edx]
</div><div class='del'>-	xor	eax, DWORD PTR[edi+edx]
</div><div class='del'>-	jnz	SHORT LeaveLoopCmps
</div><div class='del'>-
</div><div class='del'>-	mov	eax, DWORD PTR[esi+edx+4]
</div><div class='del'>-	xor	eax, DWORD PTR[edi+edx+4]
</div><div class='del'>-	jnz	SHORT LeaveLoopCmps4
</div><div class='del'>-
</div><div class='del'>-	add	edx, 8
</div><div class='del'>-	jnz	SHORT LoopCmps
</div><div class='del'>-	jmp	LenMaximum
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-
</div><div class='del'>-LeaveLoopCmps4:
</div><div class='del'>-	add	edx, 4
</div><div class='del'>-
</div><div class='del'>-LeaveLoopCmps:
</div><div class='del'>-	test	eax, 00000FFFFH
</div><div class='del'>-	jnz	SHORT LenLower
</div><div class='del'>-
</div><div class='del'>-	add	edx, 2
</div><div class='del'>-	shr	eax, 16
</div><div class='del'>-
</div><div class='del'>-LenLower:
</div><div class='del'>-	sub	al, 1
</div><div class='del'>-	adc	edx, 0
</div><div class='del'>-
</div><div class='del'>-;/* Calculate the length of the match. If it is longer than MAX_MATCH,  */
</div><div class='del'>-;/* then automatically accept it as the best possible match and leave.  */
</div><div class='del'>-
</div><div class='del'>-	lea	eax, [edi+edx]
</div><div class='del'>-	mov	edi, [esp+scan]
</div><div class='del'>-	sub	eax, edi
</div><div class='del'>-	cmp	eax, MAX_MATCH
</div><div class='del'>-	jge	SHORT LenMaximum
</div><div class='del'>-
</div><div class='del'>-;/* If the length of the match is not longer than the best match we     */
</div><div class='del'>-;/* have so far, then forget it and return to the lookup loop.          */
</div><div class='del'>-
</div><div class='del'>-	mov	edx, [esp+deflatestate]
</div><div class='del'>-	mov	ebx, [esp+bestlen]
</div><div class='del'>-	cmp	eax, ebx
</div><div class='del'>-	jg	SHORT LongerMatch
</div><div class='del'>-	mov	esi, [esp+windowbestlen]
</div><div class='del'>-	mov	edi, [edx].ds_prev
</div><div class='del'>-	mov	ebx, [esp+scanend]
</div><div class='del'>-	mov	edx, [esp+chainlenwmask]
</div><div class='del'>-	jmp	LookupLoop
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-
</div><div class='del'>-;/*         s-&gt;match_start = cur_match;                                 */
</div><div class='del'>-;/*         best_len = len;                                             */
</div><div class='del'>-;/*         if (len &gt;= nice_match) break;                               */
</div><div class='del'>-;/*         scan_end = *(ushf*)(scan+best_len-1);                       */
</div><div class='del'>-
</div><div class='del'>-LongerMatch:
</div><div class='del'>-	mov	ebx, [esp+nicematch]
</div><div class='del'>-	mov	[esp+bestlen], eax
</div><div class='del'>-	mov	[edx].ds_match_start, ecx
</div><div class='del'>-	cmp	eax, ebx
</div><div class='del'>-	jge	SHORT LeaveNow
</div><div class='del'>-	mov	esi, [esp+window]
</div><div class='del'>-	add	esi, eax
</div><div class='del'>-	mov	[esp+windowbestlen], esi
</div><div class='del'>-	movzx	ebx, WORD PTR[edi+eax-1]
</div><div class='del'>-	mov	edi, [edx].ds_prev
</div><div class='del'>-	mov	[esp+scanend], ebx
</div><div class='del'>-	mov	edx, [esp+chainlenwmask]
</div><div class='del'>-	jmp	LookupLoop
</div><div class='del'>-	ALIGN	4
</div><div class='del'>-
</div><div class='del'>-;/* Accept the current string, with the maximum possible length.        */
</div><div class='del'>-
</div><div class='del'>-LenMaximum:
</div><div class='del'>-	mov	edx, [esp+deflatestate]
</div><div class='del'>-	mov	DWORD PTR[esp+bestlen], MAX_MATCH
</div><div class='del'>-	mov	[edx].ds_match_start, ecx
</div><div class='del'>-
</div><div class='del'>-;/* if ((uInt)best_len &lt;= s-&gt;lookahead) return (uInt)best_len;          */
</div><div class='del'>-;/* return s-&gt;lookahead;                                                */
</div><div class='del'>-
</div><div class='del'>-LeaveNow:
</div><div class='del'>-	mov	edx, [esp+deflatestate]
</div><div class='del'>-	mov	ebx, [esp+bestlen]
</div><div class='del'>-	mov	eax, [edx].ds_lookahead
</div><div class='del'>-	cmp	ebx, eax
</div><div class='del'>-	jg	SHORT LookaheadRet
</div><div class='del'>-	mov	eax, ebx
</div><div class='del'>-LookaheadRet:
</div><div class='del'>-
</div><div class='del'>-; Restore the stack and return from whence we came.
</div><div class='del'>-
</div><div class='del'>-	add	esp, varsize
</div><div class='del'>-	pop	ebx
</div><div class='del'>-	pop	esi
</div><div class='del'>-	pop	edi
</div><div class='del'>-	pop	ebp
</div><div class='del'>-	ret
</div><div class='del'>-
</div><div class='del'>-_longest_match	ENDP
</div><div class='del'>-
</div><div class='del'>-_TEXT	ENDS
</div><div class='del'>-END
</div><div class='head'>diff --git a/compat/zlib/contrib/masmx64/gvmat64.obj b/compat/zlib/contrib/masmx64/gvmat64.obj<br/>deleted file mode 100644<br/>index a49ca02..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx64/gvmat64.obj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx64/gvmat64.obj</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/compat/zlib/contrib/masmx64/inffasx64.obj b/compat/zlib/contrib/masmx64/inffasx64.obj<br/>deleted file mode 100644<br/>index 8df5d82..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx64/inffasx64.obj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx64/inffasx64.obj</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/compat/zlib/contrib/masmx86/gvmat32.asm b/compat/zlib/contrib/masmx86/gvmat32.asm<br/>deleted file mode 100644<br/>index 874bb2d..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/gvmat32.asm?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/gvmat32.asm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,972 +0,0 @@</div><div class='del'>-; gvmat32.asm -- Asm portion of the optimized longest_match for 32 bits x86
</div><div class='del'>-; Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
</div><div class='del'>-; File written by Gilles Vollant, by modifiying the longest_match
</div><div class='del'>-;  from Jean-loup Gailly in deflate.c
</div><div class='del'>-;
</div><div class='del'>-;         http://www.zlib.net
</div><div class='del'>-;         http://www.winimage.com/zLibDll
</div><div class='del'>-;         http://www.muppetlabs.com/~breadbox/software/assembly.html
</div><div class='del'>-;
</div><div class='del'>-; For Visual C++ 4.x and higher and ML 6.x and higher
</div><div class='del'>-;   ml.exe is in directory \MASM611C of Win95 DDK
</div><div class='del'>-;   ml.exe is also distributed in http://www.masm32.com/masmdl.htm
</div><div class='del'>-;    and in VC++2003 toolkit at http://msdn.microsoft.com/visualc/vctoolkit2003/
</div><div class='del'>-;
</div><div class='del'>-; this file contain two implementation of longest_match
</div><div class='del'>-;
</div><div class='del'>-;  longest_match_7fff : written 1996 by Gilles Vollant optimized for 
</div><div class='del'>-;            first Pentium. Assume s-&gt;w_mask == 0x7fff
</div><div class='del'>-;  longest_match_686 : written by Brian raiter (1998), optimized for Pentium Pro
</div><div class='del'>-;
</div><div class='del'>-;  for using an seembly version of longest_match, you need define ASMV in project
</div><div class='del'>-;  There is two way in using gvmat32.asm
</div><div class='del'>-;
</div><div class='del'>-;  A) Suggested method
</div><div class='del'>-;    if you want include both longest_match_7fff and longest_match_686
</div><div class='del'>-;    compile the asm file running
</div><div class='del'>-;           ml /coff /Zi /Flgvmat32.lst /c gvmat32.asm
</div><div class='del'>-;    and include gvmat32c.c in your project
</div><div class='del'>-;    if you have an old cpu (386,486 or first Pentium) and s-&gt;w_mask==0x7fff,
</div><div class='del'>-;        longest_match_7fff will be used
</div><div class='del'>-;    if you have a more modern CPU (Pentium Pro, II and higher)
</div><div class='del'>-;        longest_match_686 will be used
</div><div class='del'>-;    on old cpu with s-&gt;w_mask!=0x7fff, longest_match_686 will be used,
</div><div class='del'>-;        but this is not a sitation you'll find often
</div><div class='del'>-;
</div><div class='del'>-;  B) Alternative
</div><div class='del'>-;    if you are not interresed in old cpu performance and want the smaller
</div><div class='del'>-;       binaries possible
</div><div class='del'>-;
</div><div class='del'>-;    compile the asm file running
</div><div class='del'>-;           ml /coff /Zi /c /Flgvmat32.lst /DNOOLDPENTIUMCODE gvmat32.asm
</div><div class='del'>-;    and do not include gvmat32c.c in your project (ou define also 
</div><div class='del'>-;              NOOLDPENTIUMCODE)
</div><div class='del'>-;
</div><div class='del'>-; note : as I known, longest_match_686 is very faster than longest_match_7fff
</div><div class='del'>-;        on pentium Pro/II/III, faster (but less) in P4, but it seem
</div><div class='del'>-;        longest_match_7fff can be faster (very very litte) on AMD Athlon64/K8
</div><div class='del'>-;
</div><div class='del'>-; see below : zlib1222add must be adjuster if you use a zlib version &lt; 1.2.2.2
</div><div class='del'>-
</div><div class='del'>-;uInt longest_match_7fff(s, cur_match)
</div><div class='del'>-;    deflate_state *s;
</div><div class='del'>-;    IPos cur_match;                             /* current match */
</div><div class='del'>-
</div><div class='del'>-    NbStack         equ     76
</div><div class='del'>-    cur_match       equ     dword ptr[esp+NbStack-0]
</div><div class='del'>-    str_s           equ     dword ptr[esp+NbStack-4]
</div><div class='del'>-; 5 dword on top (ret,ebp,esi,edi,ebx)
</div><div class='del'>-    adrret          equ     dword ptr[esp+NbStack-8]
</div><div class='del'>-    pushebp         equ     dword ptr[esp+NbStack-12]
</div><div class='del'>-    pushedi         equ     dword ptr[esp+NbStack-16]
</div><div class='del'>-    pushesi         equ     dword ptr[esp+NbStack-20]
</div><div class='del'>-    pushebx         equ     dword ptr[esp+NbStack-24]
</div><div class='del'>-
</div><div class='del'>-    chain_length    equ     dword ptr [esp+NbStack-28]
</div><div class='del'>-    limit           equ     dword ptr [esp+NbStack-32]
</div><div class='del'>-    best_len        equ     dword ptr [esp+NbStack-36]
</div><div class='del'>-    window          equ     dword ptr [esp+NbStack-40]
</div><div class='del'>-    prev            equ     dword ptr [esp+NbStack-44]
</div><div class='del'>-    scan_start      equ      word ptr [esp+NbStack-48]
</div><div class='del'>-    wmask           equ     dword ptr [esp+NbStack-52]
</div><div class='del'>-    match_start_ptr equ     dword ptr [esp+NbStack-56]
</div><div class='del'>-    nice_match      equ     dword ptr [esp+NbStack-60]
</div><div class='del'>-    scan            equ     dword ptr [esp+NbStack-64]
</div><div class='del'>-
</div><div class='del'>-    windowlen       equ     dword ptr [esp+NbStack-68]
</div><div class='del'>-    match_start     equ     dword ptr [esp+NbStack-72]
</div><div class='del'>-    strend          equ     dword ptr [esp+NbStack-76]
</div><div class='del'>-    NbStackAdd      equ     (NbStack-24)
</div><div class='del'>-
</div><div class='del'>-    .386p
</div><div class='del'>-
</div><div class='del'>-    name    gvmatch
</div><div class='del'>-    .MODEL  FLAT
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-;  all the +zlib1222add offsets are due to the addition of fields
</div><div class='del'>-;  in zlib in the deflate_state structure since the asm code was first written
</div><div class='del'>-;  (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
</div><div class='del'>-;  (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
</div><div class='del'>-;  if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
</div><div class='del'>-
</div><div class='del'>-    zlib1222add         equ     8
</div><div class='del'>-
</div><div class='del'>-;  Note : these value are good with a 8 bytes boundary pack structure
</div><div class='del'>-    dep_chain_length    equ     74h+zlib1222add
</div><div class='del'>-    dep_window          equ     30h+zlib1222add
</div><div class='del'>-    dep_strstart        equ     64h+zlib1222add
</div><div class='del'>-    dep_prev_length     equ     70h+zlib1222add
</div><div class='del'>-    dep_nice_match      equ     88h+zlib1222add
</div><div class='del'>-    dep_w_size          equ     24h+zlib1222add
</div><div class='del'>-    dep_prev            equ     38h+zlib1222add
</div><div class='del'>-    dep_w_mask          equ     2ch+zlib1222add
</div><div class='del'>-    dep_good_match      equ     84h+zlib1222add
</div><div class='del'>-    dep_match_start     equ     68h+zlib1222add
</div><div class='del'>-    dep_lookahead       equ     6ch+zlib1222add
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-_TEXT                   segment
</div><div class='del'>-
</div><div class='del'>-IFDEF NOUNDERLINE
</div><div class='del'>-   IFDEF NOOLDPENTIUMCODE
</div><div class='del'>-            public  longest_match
</div><div class='del'>-            public  match_init
</div><div class='del'>-   ELSE            
</div><div class='del'>-            public  longest_match_7fff
</div><div class='del'>-            public  cpudetect32
</div><div class='del'>-            public  longest_match_686
</div><div class='del'>-   ENDIF
</div><div class='del'>-ELSE
</div><div class='del'>-   IFDEF NOOLDPENTIUMCODE
</div><div class='del'>-            public  _longest_match
</div><div class='del'>-            public  _match_init
</div><div class='del'>-   ELSE
</div><div class='del'>-            public  _longest_match_7fff
</div><div class='del'>-            public  _cpudetect32
</div><div class='del'>-            public  _longest_match_686
</div><div class='del'>-   ENDIF
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-    MAX_MATCH           equ     258
</div><div class='del'>-    MIN_MATCH           equ     3
</div><div class='del'>-    MIN_LOOKAHEAD       equ     (MAX_MATCH+MIN_MATCH+1)
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-IFNDEF NOOLDPENTIUMCODE
</div><div class='del'>-IFDEF NOUNDERLINE
</div><div class='del'>-longest_match_7fff   proc near
</div><div class='del'>-ELSE
</div><div class='del'>-_longest_match_7fff  proc near
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-    mov     edx,[esp+4]
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-    push    ebp
</div><div class='del'>-    push    edi
</div><div class='del'>-    push    esi
</div><div class='del'>-    push    ebx
</div><div class='del'>-
</div><div class='del'>-    sub     esp,NbStackAdd
</div><div class='del'>-
</div><div class='del'>-; initialize or check the variables used in match.asm.
</div><div class='del'>-    mov     ebp,edx
</div><div class='del'>-
</div><div class='del'>-; chain_length = s-&gt;max_chain_length
</div><div class='del'>-; if (prev_length&gt;=good_match) chain_length &gt;&gt;= 2
</div><div class='del'>-    mov     edx,[ebp+dep_chain_length]
</div><div class='del'>-    mov     ebx,[ebp+dep_prev_length]
</div><div class='del'>-    cmp     [ebp+dep_good_match],ebx
</div><div class='del'>-    ja      noshr
</div><div class='del'>-    shr     edx,2
</div><div class='del'>-noshr:
</div><div class='del'>-; we increment chain_length because in the asm, the --chain_lenght is in the beginning of the loop
</div><div class='del'>-    inc     edx
</div><div class='del'>-    mov     edi,[ebp+dep_nice_match]
</div><div class='del'>-    mov     chain_length,edx
</div><div class='del'>-    mov     eax,[ebp+dep_lookahead]
</div><div class='del'>-    cmp     eax,edi
</div><div class='del'>-; if ((uInt)nice_match &gt; s-&gt;lookahead) nice_match = s-&gt;lookahead;
</div><div class='del'>-    jae     nolookaheadnicematch
</div><div class='del'>-    mov     edi,eax
</div><div class='del'>-nolookaheadnicematch:
</div><div class='del'>-; best_len = s-&gt;prev_length
</div><div class='del'>-    mov     best_len,ebx
</div><div class='del'>-
</div><div class='del'>-; window = s-&gt;window
</div><div class='del'>-    mov     esi,[ebp+dep_window]
</div><div class='del'>-    mov     ecx,[ebp+dep_strstart]
</div><div class='del'>-    mov     window,esi
</div><div class='del'>-
</div><div class='del'>-    mov     nice_match,edi
</div><div class='del'>-; scan = window + strstart
</div><div class='del'>-    add     esi,ecx
</div><div class='del'>-    mov     scan,esi
</div><div class='del'>-; dx = *window
</div><div class='del'>-    mov     dx,word ptr [esi]
</div><div class='del'>-; bx = *(window+best_len-1)
</div><div class='del'>-    mov     bx,word ptr [esi+ebx-1]
</div><div class='del'>-    add     esi,MAX_MATCH-1
</div><div class='del'>-; scan_start = *scan
</div><div class='del'>-    mov     scan_start,dx
</div><div class='del'>-; strend = scan + MAX_MATCH-1
</div><div class='del'>-    mov     strend,esi
</div><div class='del'>-; bx = scan_end = *(window+best_len-1)
</div><div class='del'>-
</div><div class='del'>-;    IPos limit = s-&gt;strstart &gt; (IPos)MAX_DIST(s) ?
</div><div class='del'>-;        s-&gt;strstart - (IPos)MAX_DIST(s) : NIL;
</div><div class='del'>-
</div><div class='del'>-    mov     esi,[ebp+dep_w_size]
</div><div class='del'>-    sub     esi,MIN_LOOKAHEAD
</div><div class='del'>-; here esi = MAX_DIST(s)
</div><div class='del'>-    sub     ecx,esi
</div><div class='del'>-    ja      nodist
</div><div class='del'>-    xor     ecx,ecx
</div><div class='del'>-nodist:
</div><div class='del'>-    mov     limit,ecx
</div><div class='del'>-
</div><div class='del'>-; prev = s-&gt;prev
</div><div class='del'>-    mov     edx,[ebp+dep_prev]
</div><div class='del'>-    mov     prev,edx
</div><div class='del'>-
</div><div class='del'>-;
</div><div class='del'>-    mov     edx,dword ptr [ebp+dep_match_start]
</div><div class='del'>-    mov     bp,scan_start
</div><div class='del'>-    mov     eax,cur_match
</div><div class='del'>-    mov     match_start,edx
</div><div class='del'>-
</div><div class='del'>-    mov     edx,window
</div><div class='del'>-    mov     edi,edx
</div><div class='del'>-    add     edi,best_len
</div><div class='del'>-    mov     esi,prev
</div><div class='del'>-    dec     edi
</div><div class='del'>-; windowlen = window + best_len -1
</div><div class='del'>-    mov     windowlen,edi
</div><div class='del'>-
</div><div class='del'>-    jmp     beginloop2
</div><div class='del'>-    align   4
</div><div class='del'>-
</div><div class='del'>-; here, in the loop
</div><div class='del'>-;       eax = ax = cur_match
</div><div class='del'>-;       ecx = limit
</div><div class='del'>-;        bx = scan_end
</div><div class='del'>-;        bp = scan_start
</div><div class='del'>-;       edi = windowlen (window + best_len -1)
</div><div class='del'>-;       esi = prev
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-;// here; chain_length &lt;=16
</div><div class='del'>-normalbeg0add16:
</div><div class='del'>-    add     chain_length,16
</div><div class='del'>-    jz      exitloop
</div><div class='del'>-normalbeg0:
</div><div class='del'>-    cmp     word ptr[edi+eax],bx
</div><div class='del'>-    je      normalbeg2noroll
</div><div class='del'>-rcontlabnoroll:
</div><div class='del'>-; cur_match = prev[cur_match &amp; wmask]
</div><div class='del'>-    and     eax,7fffh
</div><div class='del'>-    mov     ax,word ptr[esi+eax*2]
</div><div class='del'>-; if cur_match &gt; limit, go to exitloop
</div><div class='del'>-    cmp     ecx,eax
</div><div class='del'>-    jnb     exitloop
</div><div class='del'>-; if --chain_length != 0, go to exitloop
</div><div class='del'>-    dec     chain_length
</div><div class='del'>-    jnz     normalbeg0
</div><div class='del'>-    jmp     exitloop
</div><div class='del'>-
</div><div class='del'>-normalbeg2noroll:
</div><div class='del'>-; if (scan_start==*(cur_match+window)) goto normalbeg2
</div><div class='del'>-    cmp     bp,word ptr[edx+eax]
</div><div class='del'>-    jne     rcontlabnoroll
</div><div class='del'>-    jmp     normalbeg2
</div><div class='del'>-
</div><div class='del'>-contloop3:
</div><div class='del'>-    mov     edi,windowlen
</div><div class='del'>-
</div><div class='del'>-; cur_match = prev[cur_match &amp; wmask]
</div><div class='del'>-    and     eax,7fffh
</div><div class='del'>-    mov     ax,word ptr[esi+eax*2]
</div><div class='del'>-; if cur_match &gt; limit, go to exitloop
</div><div class='del'>-    cmp     ecx,eax
</div><div class='del'>-jnbexitloopshort1:
</div><div class='del'>-    jnb     exitloop
</div><div class='del'>-; if --chain_length != 0, go to exitloop
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-; begin the main loop
</div><div class='del'>-beginloop2:
</div><div class='del'>-    sub     chain_length,16+1
</div><div class='del'>-; if chain_length &lt;=16, don't use the unrolled loop
</div><div class='del'>-    jna     normalbeg0add16
</div><div class='del'>-
</div><div class='del'>-do16:
</div><div class='del'>-    cmp     word ptr[edi+eax],bx
</div><div class='del'>-    je      normalbeg2dc0
</div><div class='del'>-
</div><div class='del'>-maccn   MACRO   lab
</div><div class='del'>-    and     eax,7fffh
</div><div class='del'>-    mov     ax,word ptr[esi+eax*2]
</div><div class='del'>-    cmp     ecx,eax
</div><div class='del'>-    jnb     exitloop
</div><div class='del'>-    cmp     word ptr[edi+eax],bx
</div><div class='del'>-    je      lab
</div><div class='del'>-    ENDM
</div><div class='del'>-
</div><div class='del'>-rcontloop0:
</div><div class='del'>-    maccn   normalbeg2dc1
</div><div class='del'>-
</div><div class='del'>-rcontloop1:
</div><div class='del'>-    maccn   normalbeg2dc2
</div><div class='del'>-
</div><div class='del'>-rcontloop2:
</div><div class='del'>-    maccn   normalbeg2dc3
</div><div class='del'>-
</div><div class='del'>-rcontloop3:
</div><div class='del'>-    maccn   normalbeg2dc4
</div><div class='del'>-
</div><div class='del'>-rcontloop4:
</div><div class='del'>-    maccn   normalbeg2dc5
</div><div class='del'>-
</div><div class='del'>-rcontloop5:
</div><div class='del'>-    maccn   normalbeg2dc6
</div><div class='del'>-
</div><div class='del'>-rcontloop6:
</div><div class='del'>-    maccn   normalbeg2dc7
</div><div class='del'>-
</div><div class='del'>-rcontloop7:
</div><div class='del'>-    maccn   normalbeg2dc8
</div><div class='del'>-
</div><div class='del'>-rcontloop8:
</div><div class='del'>-    maccn   normalbeg2dc9
</div><div class='del'>-
</div><div class='del'>-rcontloop9:
</div><div class='del'>-    maccn   normalbeg2dc10
</div><div class='del'>-
</div><div class='del'>-rcontloop10:
</div><div class='del'>-    maccn   short normalbeg2dc11
</div><div class='del'>-
</div><div class='del'>-rcontloop11:
</div><div class='del'>-    maccn   short normalbeg2dc12
</div><div class='del'>-
</div><div class='del'>-rcontloop12:
</div><div class='del'>-    maccn   short normalbeg2dc13
</div><div class='del'>-
</div><div class='del'>-rcontloop13:
</div><div class='del'>-    maccn   short normalbeg2dc14
</div><div class='del'>-
</div><div class='del'>-rcontloop14:
</div><div class='del'>-    maccn   short normalbeg2dc15
</div><div class='del'>-
</div><div class='del'>-rcontloop15:
</div><div class='del'>-    and     eax,7fffh
</div><div class='del'>-    mov     ax,word ptr[esi+eax*2]
</div><div class='del'>-    cmp     ecx,eax
</div><div class='del'>-    jnb     exitloop
</div><div class='del'>-
</div><div class='del'>-    sub     chain_length,16
</div><div class='del'>-    ja      do16
</div><div class='del'>-    jmp     normalbeg0add16
</div><div class='del'>-
</div><div class='del'>-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
</div><div class='del'>-
</div><div class='del'>-normbeg MACRO   rcontlab,valsub
</div><div class='del'>-; if we are here, we know that *(match+best_len-1) == scan_end
</div><div class='del'>-    cmp     bp,word ptr[edx+eax]
</div><div class='del'>-; if (match != scan_start) goto rcontlab
</div><div class='del'>-    jne     rcontlab
</div><div class='del'>-; calculate the good chain_length, and we'll compare scan and match string
</div><div class='del'>-    add     chain_length,16-valsub
</div><div class='del'>-    jmp     iseq
</div><div class='del'>-    ENDM
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc11:
</div><div class='del'>-    normbeg rcontloop11,11
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc12:
</div><div class='del'>-    normbeg short rcontloop12,12
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc13:
</div><div class='del'>-    normbeg short rcontloop13,13
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc14:
</div><div class='del'>-    normbeg short rcontloop14,14
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc15:
</div><div class='del'>-    normbeg short rcontloop15,15
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc10:
</div><div class='del'>-    normbeg rcontloop10,10
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc9:
</div><div class='del'>-    normbeg rcontloop9,9
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc8:
</div><div class='del'>-    normbeg rcontloop8,8
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc7:
</div><div class='del'>-    normbeg rcontloop7,7
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc6:
</div><div class='del'>-    normbeg rcontloop6,6
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc5:
</div><div class='del'>-    normbeg rcontloop5,5
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc4:
</div><div class='del'>-    normbeg rcontloop4,4
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc3:
</div><div class='del'>-    normbeg rcontloop3,3
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc2:
</div><div class='del'>-    normbeg rcontloop2,2
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc1:
</div><div class='del'>-    normbeg rcontloop1,1
</div><div class='del'>-
</div><div class='del'>-normalbeg2dc0:
</div><div class='del'>-    normbeg rcontloop0,0
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-; we go in normalbeg2 because *(ushf*)(match+best_len-1) == scan_end
</div><div class='del'>-
</div><div class='del'>-normalbeg2:
</div><div class='del'>-    mov     edi,window
</div><div class='del'>-
</div><div class='del'>-    cmp     bp,word ptr[edi+eax]
</div><div class='del'>-    jne     contloop3                   ; if *(ushf*)match != scan_start, continue
</div><div class='del'>-
</div><div class='del'>-iseq:
</div><div class='del'>-; if we are here, we know that *(match+best_len-1) == scan_end
</div><div class='del'>-; and (match == scan_start)
</div><div class='del'>-
</div><div class='del'>-    mov     edi,edx
</div><div class='del'>-    mov     esi,scan                    ; esi = scan
</div><div class='del'>-    add     edi,eax                     ; edi = window + cur_match = match
</div><div class='del'>-
</div><div class='del'>-    mov     edx,[esi+3]                 ; compare manually dword at match+3
</div><div class='del'>-    xor     edx,[edi+3]                 ; and scan +3
</div><div class='del'>-
</div><div class='del'>-    jz      begincompare                ; if equal, go to long compare
</div><div class='del'>-
</div><div class='del'>-; we will determine the unmatch byte and calculate len (in esi)
</div><div class='del'>-    or      dl,dl
</div><div class='del'>-    je      eq1rr
</div><div class='del'>-    mov     esi,3
</div><div class='del'>-    jmp     trfinval
</div><div class='del'>-eq1rr:
</div><div class='del'>-    or      dx,dx
</div><div class='del'>-    je      eq1
</div><div class='del'>-
</div><div class='del'>-    mov     esi,4
</div><div class='del'>-    jmp     trfinval
</div><div class='del'>-eq1:
</div><div class='del'>-    and     edx,0ffffffh
</div><div class='del'>-    jz      eq11
</div><div class='del'>-    mov     esi,5
</div><div class='del'>-    jmp     trfinval
</div><div class='del'>-eq11:
</div><div class='del'>-    mov     esi,6
</div><div class='del'>-    jmp     trfinval
</div><div class='del'>-
</div><div class='del'>-begincompare:
</div><div class='del'>-    ; here we now scan and match begin same
</div><div class='del'>-    add     edi,6
</div><div class='del'>-    add     esi,6
</div><div class='del'>-    mov     ecx,(MAX_MATCH-(2+4))/4     ; scan for at most MAX_MATCH bytes
</div><div class='del'>-    repe    cmpsd                       ; loop until mismatch
</div><div class='del'>-
</div><div class='del'>-    je      trfin                       ; go to trfin if not unmatch
</div><div class='del'>-; we determine the unmatch byte
</div><div class='del'>-    sub     esi,4
</div><div class='del'>-    mov     edx,[edi-4]
</div><div class='del'>-    xor     edx,[esi]
</div><div class='del'>-
</div><div class='del'>-    or      dl,dl
</div><div class='del'>-    jnz     trfin
</div><div class='del'>-    inc     esi
</div><div class='del'>-
</div><div class='del'>-    or      dx,dx
</div><div class='del'>-    jnz     trfin
</div><div class='del'>-    inc     esi
</div><div class='del'>-
</div><div class='del'>-    and     edx,0ffffffh
</div><div class='del'>-    jnz     trfin
</div><div class='del'>-    inc     esi
</div><div class='del'>-
</div><div class='del'>-trfin:
</div><div class='del'>-    sub     esi,scan          ; esi = len
</div><div class='del'>-trfinval:
</div><div class='del'>-; here we have finised compare, and esi contain len of equal string
</div><div class='del'>-    cmp     esi,best_len        ; if len &gt; best_len, go newbestlen
</div><div class='del'>-    ja      short newbestlen
</div><div class='del'>-; now we restore edx, ecx and esi, for the big loop
</div><div class='del'>-    mov     esi,prev
</div><div class='del'>-    mov     ecx,limit
</div><div class='del'>-    mov     edx,window
</div><div class='del'>-    jmp     contloop3
</div><div class='del'>-
</div><div class='del'>-newbestlen:
</div><div class='del'>-    mov     best_len,esi        ; len become best_len
</div><div class='del'>-
</div><div class='del'>-    mov     match_start,eax     ; save new position as match_start
</div><div class='del'>-    cmp     esi,nice_match      ; if best_len &gt;= nice_match, exit
</div><div class='del'>-    jae     exitloop
</div><div class='del'>-    mov     ecx,scan
</div><div class='del'>-    mov     edx,window          ; restore edx=window
</div><div class='del'>-    add     ecx,esi
</div><div class='del'>-    add     esi,edx
</div><div class='del'>-
</div><div class='del'>-    dec     esi
</div><div class='del'>-    mov     windowlen,esi       ; windowlen = window + best_len-1
</div><div class='del'>-    mov     bx,[ecx-1]          ; bx = *(scan+best_len-1) = scan_end
</div><div class='del'>-
</div><div class='del'>-; now we restore ecx and esi, for the big loop :
</div><div class='del'>-    mov     esi,prev
</div><div class='del'>-    mov     ecx,limit
</div><div class='del'>-    jmp     contloop3
</div><div class='del'>-
</div><div class='del'>-exitloop:
</div><div class='del'>-; exit : s-&gt;match_start=match_start
</div><div class='del'>-    mov     ebx,match_start
</div><div class='del'>-    mov     ebp,str_s
</div><div class='del'>-    mov     ecx,best_len
</div><div class='del'>-    mov     dword ptr [ebp+dep_match_start],ebx
</div><div class='del'>-    mov     eax,dword ptr [ebp+dep_lookahead]
</div><div class='del'>-    cmp     ecx,eax
</div><div class='del'>-    ja      minexlo
</div><div class='del'>-    mov     eax,ecx
</div><div class='del'>-minexlo:
</div><div class='del'>-; return min(best_len,s-&gt;lookahead)
</div><div class='del'>-
</div><div class='del'>-; restore stack and register ebx,esi,edi,ebp
</div><div class='del'>-    add     esp,NbStackAdd
</div><div class='del'>-
</div><div class='del'>-    pop     ebx
</div><div class='del'>-    pop     esi
</div><div class='del'>-    pop     edi
</div><div class='del'>-    pop     ebp
</div><div class='del'>-    ret
</div><div class='del'>-InfoAuthor:
</div><div class='del'>-; please don't remove this string !
</div><div class='del'>-; Your are free use gvmat32 in any fre or commercial apps if you don't remove the string in the binary!
</div><div class='del'>-    db     0dh,0ah,"GVMat32 optimised assembly code written 1996-98 by Gilles Vollant",0dh,0ah
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-IFDEF NOUNDERLINE
</div><div class='del'>-longest_match_7fff   endp
</div><div class='del'>-ELSE
</div><div class='del'>-_longest_match_7fff  endp
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-IFDEF NOUNDERLINE
</div><div class='del'>-cpudetect32     proc near
</div><div class='del'>-ELSE
</div><div class='del'>-_cpudetect32    proc near
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-    push    ebx
</div><div class='del'>-
</div><div class='del'>-    pushfd                  ; push original EFLAGS
</div><div class='del'>-    pop     eax             ; get original EFLAGS
</div><div class='del'>-    mov     ecx, eax        ; save original EFLAGS
</div><div class='del'>-    xor     eax, 40000h     ; flip AC bit in EFLAGS
</div><div class='del'>-    push    eax             ; save new EFLAGS value on stack
</div><div class='del'>-    popfd                   ; replace current EFLAGS value
</div><div class='del'>-    pushfd                  ; get new EFLAGS
</div><div class='del'>-    pop     eax             ; store new EFLAGS in EAX
</div><div class='del'>-    xor     eax, ecx        ; can’t toggle AC bit, processor=80386
</div><div class='del'>-    jz      end_cpu_is_386  ; jump if 80386 processor
</div><div class='del'>-    push    ecx
</div><div class='del'>-    popfd                   ; restore AC bit in EFLAGS first
</div><div class='del'>-
</div><div class='del'>-    pushfd
</div><div class='del'>-    pushfd
</div><div class='del'>-    pop     ecx
</div><div class='del'>-
</div><div class='del'>-    mov     eax, ecx        ; get original EFLAGS
</div><div class='del'>-    xor     eax, 200000h    ; flip ID bit in EFLAGS
</div><div class='del'>-    push    eax             ; save new EFLAGS value on stack
</div><div class='del'>-    popfd                   ; replace current EFLAGS value
</div><div class='del'>-    pushfd                  ; get new EFLAGS
</div><div class='del'>-    pop     eax             ; store new EFLAGS in EAX
</div><div class='del'>-    popfd                   ; restore original EFLAGS
</div><div class='del'>-    xor     eax, ecx        ; can’t toggle ID bit,
</div><div class='del'>-    je      is_old_486      ; processor=old
</div><div class='del'>-
</div><div class='del'>-    mov     eax,1
</div><div class='del'>-    db      0fh,0a2h        ;CPUID
</div><div class='del'>-
</div><div class='del'>-exitcpudetect:
</div><div class='del'>-    pop ebx
</div><div class='del'>-    ret
</div><div class='del'>-
</div><div class='del'>-end_cpu_is_386:
</div><div class='del'>-    mov     eax,0300h
</div><div class='del'>-    jmp     exitcpudetect
</div><div class='del'>-
</div><div class='del'>-is_old_486:
</div><div class='del'>-    mov     eax,0400h
</div><div class='del'>-    jmp     exitcpudetect
</div><div class='del'>-
</div><div class='del'>-IFDEF NOUNDERLINE
</div><div class='del'>-cpudetect32     endp
</div><div class='del'>-ELSE
</div><div class='del'>-_cpudetect32    endp
</div><div class='del'>-ENDIF
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-MAX_MATCH       equ     258
</div><div class='del'>-MIN_MATCH       equ     3
</div><div class='del'>-MIN_LOOKAHEAD   equ     (MAX_MATCH + MIN_MATCH + 1)
</div><div class='del'>-MAX_MATCH_8_     equ     ((MAX_MATCH + 7) AND 0FFF0h)
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-;;; stack frame offsets
</div><div class='del'>-
</div><div class='del'>-chainlenwmask   equ  esp + 0    ; high word: current chain len
</div><div class='del'>-                    ; low word: s-&gt;wmask
</div><div class='del'>-window      equ  esp + 4    ; local copy of s-&gt;window
</div><div class='del'>-windowbestlen   equ  esp + 8    ; s-&gt;window + bestlen
</div><div class='del'>-scanstart   equ  esp + 16   ; first two bytes of string
</div><div class='del'>-scanend     equ  esp + 12   ; last two bytes of string
</div><div class='del'>-scanalign   equ  esp + 20   ; dword-misalignment of string
</div><div class='del'>-nicematch   equ  esp + 24   ; a good enough match size
</div><div class='del'>-bestlen     equ  esp + 28   ; size of best match so far
</div><div class='del'>-scan        equ  esp + 32   ; ptr to string wanting match
</div><div class='del'>-
</div><div class='del'>-LocalVarsSize   equ 36
</div><div class='del'>-;   saved ebx   byte esp + 36
</div><div class='del'>-;   saved edi   byte esp + 40
</div><div class='del'>-;   saved esi   byte esp + 44
</div><div class='del'>-;   saved ebp   byte esp + 48
</div><div class='del'>-;   return address  byte esp + 52
</div><div class='del'>-deflatestate    equ  esp + 56   ; the function arguments
</div><div class='del'>-curmatch    equ  esp + 60
</div><div class='del'>-
</div><div class='del'>-;;; Offsets for fields in the deflate_state structure. These numbers
</div><div class='del'>-;;; are calculated from the definition of deflate_state, with the
</div><div class='del'>-;;; assumption that the compiler will dword-align the fields. (Thus,
</div><div class='del'>-;;; changing the definition of deflate_state could easily cause this
</div><div class='del'>-;;; program to crash horribly, without so much as a warning at
</div><div class='del'>-;;; compile time. Sigh.)
</div><div class='del'>-
</div><div class='del'>-dsWSize     equ 36+zlib1222add
</div><div class='del'>-dsWMask     equ 44+zlib1222add
</div><div class='del'>-dsWindow    equ 48+zlib1222add
</div><div class='del'>-dsPrev      equ 56+zlib1222add
</div><div class='del'>-dsMatchLen  equ 88+zlib1222add
</div><div class='del'>-dsPrevMatch equ 92+zlib1222add
</div><div class='del'>-dsStrStart  equ 100+zlib1222add
</div><div class='del'>-dsMatchStart    equ 104+zlib1222add
</div><div class='del'>-dsLookahead equ 108+zlib1222add
</div><div class='del'>-dsPrevLen   equ 112+zlib1222add
</div><div class='del'>-dsMaxChainLen   equ 116+zlib1222add
</div><div class='del'>-dsGoodMatch equ 132+zlib1222add
</div><div class='del'>-dsNiceMatch equ 136+zlib1222add
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-;;; match.asm -- Pentium-Pro-optimized version of longest_match()
</div><div class='del'>-;;; Written for zlib 1.1.2
</div><div class='del'>-;;; Copyright (C) 1998 Brian Raiter &lt;breadbox@muppetlabs.com&gt;
</div><div class='del'>-;;; You can look at http://www.muppetlabs.com/~breadbox/software/assembly.html
</div><div class='del'>-;;;
</div><div class='del'>-;;; This is free software; you can redistribute it and/or modify it
</div><div class='del'>-;;; under the terms of the GNU General Public License.
</div><div class='del'>-
</div><div class='del'>-;GLOBAL _longest_match, _match_init
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-;SECTION    .text
</div><div class='del'>-
</div><div class='del'>-;;; uInt longest_match(deflate_state *deflatestate, IPos curmatch)
</div><div class='del'>-
</div><div class='del'>-;_longest_match:
</div><div class='del'>-IFDEF NOOLDPENTIUMCODE
</div><div class='del'>-    IFDEF NOUNDERLINE
</div><div class='del'>-    longest_match       proc near
</div><div class='del'>-    ELSE
</div><div class='del'>-    _longest_match      proc near
</div><div class='del'>-    ENDIF
</div><div class='del'>-ELSE
</div><div class='del'>-    IFDEF NOUNDERLINE
</div><div class='del'>-    longest_match_686   proc near
</div><div class='del'>-    ELSE
</div><div class='del'>-    _longest_match_686  proc near
</div><div class='del'>-    ENDIF
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-;;; Save registers that the compiler may be using, and adjust esp to
</div><div class='del'>-;;; make room for our stack frame.
</div><div class='del'>-
</div><div class='del'>-        push    ebp
</div><div class='del'>-        push    edi
</div><div class='del'>-        push    esi
</div><div class='del'>-        push    ebx
</div><div class='del'>-        sub esp, LocalVarsSize
</div><div class='del'>-
</div><div class='del'>-;;; Retrieve the function arguments. ecx will hold cur_match
</div><div class='del'>-;;; throughout the entire function. edx will hold the pointer to the
</div><div class='del'>-;;; deflate_state structure during the function's setup (before
</div><div class='del'>-;;; entering the main loop.
</div><div class='del'>-
</div><div class='del'>-        mov edx, [deflatestate]
</div><div class='del'>-        mov ecx, [curmatch]
</div><div class='del'>-
</div><div class='del'>-;;; uInt wmask = s-&gt;w_mask;
</div><div class='del'>-;;; unsigned chain_length = s-&gt;max_chain_length;
</div><div class='del'>-;;; if (s-&gt;prev_length &gt;= s-&gt;good_match) {
</div><div class='del'>-;;;     chain_length &gt;&gt;= 2;
</div><div class='del'>-;;; }
</div><div class='del'>-
</div><div class='del'>-        mov eax, [edx + dsPrevLen]
</div><div class='del'>-        mov ebx, [edx + dsGoodMatch]
</div><div class='del'>-        cmp eax, ebx
</div><div class='del'>-        mov eax, [edx + dsWMask]
</div><div class='del'>-        mov ebx, [edx + dsMaxChainLen]
</div><div class='del'>-        jl  LastMatchGood
</div><div class='del'>-        shr ebx, 2
</div><div class='del'>-LastMatchGood:
</div><div class='del'>-
</div><div class='del'>-;;; chainlen is decremented once beforehand so that the function can
</div><div class='del'>-;;; use the sign flag instead of the zero flag for the exit test.
</div><div class='del'>-;;; It is then shifted into the high word, to make room for the wmask
</div><div class='del'>-;;; value, which it will always accompany.
</div><div class='del'>-
</div><div class='del'>-        dec ebx
</div><div class='del'>-        shl ebx, 16
</div><div class='del'>-        or  ebx, eax
</div><div class='del'>-        mov [chainlenwmask], ebx
</div><div class='del'>-
</div><div class='del'>-;;; if ((uInt)nice_match &gt; s-&gt;lookahead) nice_match = s-&gt;lookahead;
</div><div class='del'>-
</div><div class='del'>-        mov eax, [edx + dsNiceMatch]
</div><div class='del'>-        mov ebx, [edx + dsLookahead]
</div><div class='del'>-        cmp ebx, eax
</div><div class='del'>-        jl  LookaheadLess
</div><div class='del'>-        mov ebx, eax
</div><div class='del'>-LookaheadLess:  mov [nicematch], ebx
</div><div class='del'>-
</div><div class='del'>-;;; register Bytef *scan = s-&gt;window + s-&gt;strstart;
</div><div class='del'>-
</div><div class='del'>-        mov esi, [edx + dsWindow]
</div><div class='del'>-        mov [window], esi
</div><div class='del'>-        mov ebp, [edx + dsStrStart]
</div><div class='del'>-        lea edi, [esi + ebp]
</div><div class='del'>-        mov [scan], edi
</div><div class='del'>-
</div><div class='del'>-;;; Determine how many bytes the scan ptr is off from being
</div><div class='del'>-;;; dword-aligned.
</div><div class='del'>-
</div><div class='del'>-        mov eax, edi
</div><div class='del'>-        neg eax
</div><div class='del'>-        and eax, 3
</div><div class='del'>-        mov [scanalign], eax
</div><div class='del'>-
</div><div class='del'>-;;; IPos limit = s-&gt;strstart &gt; (IPos)MAX_DIST(s) ?
</div><div class='del'>-;;;     s-&gt;strstart - (IPos)MAX_DIST(s) : NIL;
</div><div class='del'>-
</div><div class='del'>-        mov eax, [edx + dsWSize]
</div><div class='del'>-        sub eax, MIN_LOOKAHEAD
</div><div class='del'>-        sub ebp, eax
</div><div class='del'>-        jg  LimitPositive
</div><div class='del'>-        xor ebp, ebp
</div><div class='del'>-LimitPositive:
</div><div class='del'>-
</div><div class='del'>-;;; int best_len = s-&gt;prev_length;
</div><div class='del'>-
</div><div class='del'>-        mov eax, [edx + dsPrevLen]
</div><div class='del'>-        mov [bestlen], eax
</div><div class='del'>-
</div><div class='del'>-;;; Store the sum of s-&gt;window + best_len in esi locally, and in esi.
</div><div class='del'>-
</div><div class='del'>-        add esi, eax
</div><div class='del'>-        mov [windowbestlen], esi
</div><div class='del'>-
</div><div class='del'>-;;; register ush scan_start = *(ushf*)scan;
</div><div class='del'>-;;; register ush scan_end   = *(ushf*)(scan+best_len-1);
</div><div class='del'>-;;; Posf *prev = s-&gt;prev;
</div><div class='del'>-
</div><div class='del'>-        movzx   ebx, word ptr [edi]
</div><div class='del'>-        mov [scanstart], ebx
</div><div class='del'>-        movzx   ebx, word ptr [edi + eax - 1]
</div><div class='del'>-        mov [scanend], ebx
</div><div class='del'>-        mov edi, [edx + dsPrev]
</div><div class='del'>-
</div><div class='del'>-;;; Jump into the main loop.
</div><div class='del'>-
</div><div class='del'>-        mov edx, [chainlenwmask]
</div><div class='del'>-        jmp short LoopEntry
</div><div class='del'>-
</div><div class='del'>-align 4
</div><div class='del'>-
</div><div class='del'>-;;; do {
</div><div class='del'>-;;;     match = s-&gt;window + cur_match;
</div><div class='del'>-;;;     if (*(ushf*)(match+best_len-1) != scan_end ||
</div><div class='del'>-;;;         *(ushf*)match != scan_start) continue;
</div><div class='del'>-;;;     [...]
</div><div class='del'>-;;; } while ((cur_match = prev[cur_match &amp; wmask]) &gt; limit
</div><div class='del'>-;;;          &amp;&amp; --chain_length != 0);
</div><div class='del'>-;;;
</div><div class='del'>-;;; Here is the inner loop of the function. The function will spend the
</div><div class='del'>-;;; majority of its time in this loop, and majority of that time will
</div><div class='del'>-;;; be spent in the first ten instructions.
</div><div class='del'>-;;;
</div><div class='del'>-;;; Within this loop:
</div><div class='del'>-;;; ebx = scanend
</div><div class='del'>-;;; ecx = curmatch
</div><div class='del'>-;;; edx = chainlenwmask - i.e., ((chainlen &lt;&lt; 16) | wmask)
</div><div class='del'>-;;; esi = windowbestlen - i.e., (window + bestlen)
</div><div class='del'>-;;; edi = prev
</div><div class='del'>-;;; ebp = limit
</div><div class='del'>-
</div><div class='del'>-LookupLoop:
</div><div class='del'>-        and ecx, edx
</div><div class='del'>-        movzx   ecx, word ptr [edi + ecx*2]
</div><div class='del'>-        cmp ecx, ebp
</div><div class='del'>-        jbe LeaveNow
</div><div class='del'>-        sub edx, 00010000h
</div><div class='del'>-        js  LeaveNow
</div><div class='del'>-LoopEntry:  movzx   eax, word ptr [esi + ecx - 1]
</div><div class='del'>-        cmp eax, ebx
</div><div class='del'>-        jnz LookupLoop
</div><div class='del'>-        mov eax, [window]
</div><div class='del'>-        movzx   eax, word ptr [eax + ecx]
</div><div class='del'>-        cmp eax, [scanstart]
</div><div class='del'>-        jnz LookupLoop
</div><div class='del'>-
</div><div class='del'>-;;; Store the current value of chainlen.
</div><div class='del'>-
</div><div class='del'>-        mov [chainlenwmask], edx
</div><div class='del'>-
</div><div class='del'>-;;; Point edi to the string under scrutiny, and esi to the string we
</div><div class='del'>-;;; are hoping to match it up with. In actuality, esi and edi are
</div><div class='del'>-;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
</div><div class='del'>-;;; initialized to -(MAX_MATCH_8 - scanalign).
</div><div class='del'>-
</div><div class='del'>-        mov esi, [window]
</div><div class='del'>-        mov edi, [scan]
</div><div class='del'>-        add esi, ecx
</div><div class='del'>-        mov eax, [scanalign]
</div><div class='del'>-        mov edx, 0fffffef8h; -(MAX_MATCH_8)
</div><div class='del'>-        lea edi, [edi + eax + 0108h] ;MAX_MATCH_8]
</div><div class='del'>-        lea esi, [esi + eax + 0108h] ;MAX_MATCH_8]
</div><div class='del'>-
</div><div class='del'>-;;; Test the strings for equality, 8 bytes at a time. At the end,
</div><div class='del'>-;;; adjust edx so that it is offset to the exact byte that mismatched.
</div><div class='del'>-;;;
</div><div class='del'>-;;; We already know at this point that the first three bytes of the
</div><div class='del'>-;;; strings match each other, and they can be safely passed over before
</div><div class='del'>-;;; starting the compare loop. So what this code does is skip over 0-3
</div><div class='del'>-;;; bytes, as much as necessary in order to dword-align the edi
</div><div class='del'>-;;; pointer. (esi will still be misaligned three times out of four.)
</div><div class='del'>-;;;
</div><div class='del'>-;;; It should be confessed that this loop usually does not represent
</div><div class='del'>-;;; much of the total running time. Replacing it with a more
</div><div class='del'>-;;; straightforward "rep cmpsb" would not drastically degrade
</div><div class='del'>-;;; performance.
</div><div class='del'>-
</div><div class='del'>-LoopCmps:
</div><div class='del'>-        mov eax, [esi + edx]
</div><div class='del'>-        xor eax, [edi + edx]
</div><div class='del'>-        jnz LeaveLoopCmps
</div><div class='del'>-        mov eax, [esi + edx + 4]
</div><div class='del'>-        xor eax, [edi + edx + 4]
</div><div class='del'>-        jnz LeaveLoopCmps4
</div><div class='del'>-        add edx, 8
</div><div class='del'>-        jnz LoopCmps
</div><div class='del'>-        jmp short LenMaximum
</div><div class='del'>-LeaveLoopCmps4: add edx, 4
</div><div class='del'>-LeaveLoopCmps:  test    eax, 0000FFFFh
</div><div class='del'>-        jnz LenLower
</div><div class='del'>-        add edx,  2
</div><div class='del'>-        shr eax, 16
</div><div class='del'>-LenLower:   sub al, 1
</div><div class='del'>-        adc edx, 0
</div><div class='del'>-
</div><div class='del'>-;;; Calculate the length of the match. If it is longer than MAX_MATCH,
</div><div class='del'>-;;; then automatically accept it as the best possible match and leave.
</div><div class='del'>-
</div><div class='del'>-        lea eax, [edi + edx]
</div><div class='del'>-        mov edi, [scan]
</div><div class='del'>-        sub eax, edi
</div><div class='del'>-        cmp eax, MAX_MATCH
</div><div class='del'>-        jge LenMaximum
</div><div class='del'>-
</div><div class='del'>-;;; If the length of the match is not longer than the best match we
</div><div class='del'>-;;; have so far, then forget it and return to the lookup loop.
</div><div class='del'>-
</div><div class='del'>-        mov edx, [deflatestate]
</div><div class='del'>-        mov ebx, [bestlen]
</div><div class='del'>-        cmp eax, ebx
</div><div class='del'>-        jg  LongerMatch
</div><div class='del'>-        mov esi, [windowbestlen]
</div><div class='del'>-        mov edi, [edx + dsPrev]
</div><div class='del'>-        mov ebx, [scanend]
</div><div class='del'>-        mov edx, [chainlenwmask]
</div><div class='del'>-        jmp LookupLoop
</div><div class='del'>-
</div><div class='del'>-;;;         s-&gt;match_start = cur_match;
</div><div class='del'>-;;;         best_len = len;
</div><div class='del'>-;;;         if (len &gt;= nice_match) break;
</div><div class='del'>-;;;         scan_end = *(ushf*)(scan+best_len-1);
</div><div class='del'>-
</div><div class='del'>-LongerMatch:    mov ebx, [nicematch]
</div><div class='del'>-        mov [bestlen], eax
</div><div class='del'>-        mov [edx + dsMatchStart], ecx
</div><div class='del'>-        cmp eax, ebx
</div><div class='del'>-        jge LeaveNow
</div><div class='del'>-        mov esi, [window]
</div><div class='del'>-        add esi, eax
</div><div class='del'>-        mov [windowbestlen], esi
</div><div class='del'>-        movzx   ebx, word ptr [edi + eax - 1]
</div><div class='del'>-        mov edi, [edx + dsPrev]
</div><div class='del'>-        mov [scanend], ebx
</div><div class='del'>-        mov edx, [chainlenwmask]
</div><div class='del'>-        jmp LookupLoop
</div><div class='del'>-
</div><div class='del'>-;;; Accept the current string, with the maximum possible length.
</div><div class='del'>-
</div><div class='del'>-LenMaximum: mov edx, [deflatestate]
</div><div class='del'>-        mov dword ptr [bestlen], MAX_MATCH
</div><div class='del'>-        mov [edx + dsMatchStart], ecx
</div><div class='del'>-
</div><div class='del'>-;;; if ((uInt)best_len &lt;= s-&gt;lookahead) return (uInt)best_len;
</div><div class='del'>-;;; return s-&gt;lookahead;
</div><div class='del'>-
</div><div class='del'>-LeaveNow:
</div><div class='del'>-        mov edx, [deflatestate]
</div><div class='del'>-        mov ebx, [bestlen]
</div><div class='del'>-        mov eax, [edx + dsLookahead]
</div><div class='del'>-        cmp ebx, eax
</div><div class='del'>-        jg  LookaheadRet
</div><div class='del'>-        mov eax, ebx
</div><div class='del'>-LookaheadRet:
</div><div class='del'>-
</div><div class='del'>-;;; Restore the stack and return from whence we came.
</div><div class='del'>-
</div><div class='del'>-        add esp, LocalVarsSize
</div><div class='del'>-        pop ebx
</div><div class='del'>-        pop esi
</div><div class='del'>-        pop edi
</div><div class='del'>-        pop ebp
</div><div class='del'>-
</div><div class='del'>-        ret
</div><div class='del'>-; please don't remove this string !
</div><div class='del'>-; Your can freely use gvmat32 in any free or commercial app if you don't remove the string in the binary!
</div><div class='del'>-    db     0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998",0dh,0ah
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-IFDEF NOOLDPENTIUMCODE
</div><div class='del'>-    IFDEF NOUNDERLINE
</div><div class='del'>-    longest_match       endp
</div><div class='del'>-    ELSE
</div><div class='del'>-    _longest_match      endp
</div><div class='del'>-    ENDIF
</div><div class='del'>-
</div><div class='del'>-    IFDEF NOUNDERLINE
</div><div class='del'>-    match_init      proc near
</div><div class='del'>-                    ret
</div><div class='del'>-    match_init      endp
</div><div class='del'>-    ELSE
</div><div class='del'>-    _match_init     proc near
</div><div class='del'>-                    ret
</div><div class='del'>-    _match_init     endp
</div><div class='del'>-    ENDIF    
</div><div class='del'>-ELSE
</div><div class='del'>-    IFDEF NOUNDERLINE
</div><div class='del'>-    longest_match_686   endp
</div><div class='del'>-    ELSE
</div><div class='del'>-    _longest_match_686  endp
</div><div class='del'>-    ENDIF
</div><div class='del'>-ENDIF
</div><div class='del'>-
</div><div class='del'>-_TEXT   ends
</div><div class='del'>-end
</div><div class='head'>diff --git a/compat/zlib/contrib/masmx86/gvmat32.obj b/compat/zlib/contrib/masmx86/gvmat32.obj<br/>deleted file mode 100644<br/>index ebb3262..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/gvmat32.obj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/gvmat32.obj</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/compat/zlib/contrib/masmx86/gvmat32c.c b/compat/zlib/contrib/masmx86/gvmat32c.c<br/>deleted file mode 100644<br/>index 7ad2b27..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/gvmat32c.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/gvmat32c.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* gvmat32.c -- C portion of the optimized longest_match for 32 bits x86
</div><div class='del'>- * Copyright (C) 1995-1996 Jean-loup Gailly and Gilles Vollant.
</div><div class='del'>- * File written by Gilles Vollant, by modifiying the longest_match
</div><div class='del'>- *  from Jean-loup Gailly in deflate.c
</div><div class='del'>- *  it prepare all parameters and call the assembly longest_match_gvasm
</div><div class='del'>- *  longest_match execute standard C code is wmask != 0x7fff
</div><div class='del'>- *     (assembly code is faster with a fixed wmask)
</div><div class='del'>- *
</div><div class='del'>- * Read comment at beginning of gvmat32.asm for more information
</div><div class='del'>- */
</div><div class='del'>-
</div><div class='del'>-#if defined(ASMV) &amp;&amp; (!defined(NOOLDPENTIUMCODE))
</div><div class='del'>-#include "deflate.h"
</div><div class='del'>-
</div><div class='del'>-/* if your C compiler don't add underline before function name,
</div><div class='del'>-        define ADD_UNDERLINE_ASMFUNC */
</div><div class='del'>-#ifdef ADD_UNDERLINE_ASMFUNC
</div><div class='del'>-#define longest_match_7fff _longest_match_7fff
</div><div class='del'>-#define longest_match_686  _longest_match_686
</div><div class='del'>-#define cpudetect32        _cpudetect32
</div><div class='del'>-#endif
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-unsigned long cpudetect32();
</div><div class='del'>-
</div><div class='del'>-uInt longest_match_c(
</div><div class='del'>-    deflate_state *s,
</div><div class='del'>-    IPos cur_match);                             /* current match */
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-uInt longest_match_7fff(
</div><div class='del'>-    deflate_state *s,
</div><div class='del'>-    IPos cur_match);                             /* current match */
</div><div class='del'>-
</div><div class='del'>-uInt longest_match_686(
</div><div class='del'>-    deflate_state *s,
</div><div class='del'>-    IPos cur_match);                             /* current match */
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-static uInt iIsPPro=2;
</div><div class='del'>-
</div><div class='del'>-void match_init ()
</div><div class='del'>-{
</div><div class='del'>-    iIsPPro = (((cpudetect32()/0x100)&amp;0xf)&gt;=6) ? 1 : 0;
</div><div class='del'>-}
</div><div class='del'>-
</div><div class='del'>-uInt longest_match(
</div><div class='del'>-    deflate_state *s,
</div><div class='del'>-    IPos cur_match)                             /* current match */
</div><div class='del'>-{
</div><div class='del'>-    if (iIsPPro!=0)
</div><div class='del'>-        return longest_match_686(s,cur_match);
</div><div class='del'>-
</div><div class='del'>-    if (s-&gt;w_mask != 0x7fff)
</div><div class='del'>-        return longest_match_686(s,cur_match);
</div><div class='del'>-
</div><div class='del'>-    /* now ((s-&gt;w_mask == 0x7fff) &amp;&amp; (iIsPPro==0)) */
</div><div class='del'>-        return longest_match_7fff(s,cur_match);
</div><div class='del'>-}
</div><div class='del'>-
</div><div class='del'>-
</div><div class='del'>-#endif /* defined(ASMV) &amp;&amp; (!defined(NOOLDPENTIUMCODE)) */
</div><div class='head'>diff --git a/compat/zlib/contrib/masmx86/inffas32.asm b/compat/zlib/contrib/masmx86/inffas32.asm<br/>index 92ac22a..03d20f8 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/inffas32.asm?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/inffas32.asm</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/inffas32.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/inffas32.asm</a></div><div class='hunk'>@@ -73,11 +73,6 @@ inflate_fast_use_mmx:</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='ctx'> _TEXT			segment
</div><div class='del'>-PUBLIC _inflate_fast
</div><div class='del'>-
</div><div class='del'>-ALIGN 4
</div><div class='del'>-_inflate_fast:
</div><div class='del'>-	jmp inflate_fast_entry
</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='hunk'>@@ -163,7 +158,8 @@ distbits_state	 equ	(76+4+zlib1222sup)	;/* state-&gt;distbits */</div><div class='ctx'> ;SECTION .text
</div><div class='ctx'> 
</div><div class='ctx'> ALIGN 4
</div><div class='del'>-inflate_fast_entry:
</div><div class='add'>+_inflate_fast proc near
</div><div class='add'>+.FPO (16, 4, 0, 0, 1, 0)
</div><div class='ctx'> 	push  edi
</div><div class='ctx'> 	push  esi
</div><div class='ctx'> 	push  ebp
</div><div class='hunk'>@@ -1078,6 +1074,7 @@ L_done:</div><div class='ctx'> 	pop  esi
</div><div class='ctx'> 	pop  edi
</div><div class='ctx'> 	ret
</div><div class='add'>+_inflate_fast endp
</div><div class='ctx'> 
</div><div class='ctx'> _TEXT	ends
</div><div class='ctx'> end
</div><div class='head'>diff --git a/compat/zlib/contrib/masmx86/inffas32.obj b/compat/zlib/contrib/masmx86/inffas32.obj<br/>deleted file mode 100644<br/>index bd6664d..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/inffas32.obj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/inffas32.obj</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/compat/zlib/contrib/masmx86/match686.asm b/compat/zlib/contrib/masmx86/match686.asm<br/>index 1eaf555..3b09212 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/match686.asm?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/match686.asm</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/match686.asm?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/masmx86/match686.asm</a></div><div class='hunk'>@@ -195,6 +195,7 @@ dsNiceMatch equ 136+zlib1222add</div><div class='ctx'>     ELSE
</div><div class='ctx'>     _longest_match      proc near
</div><div class='ctx'>     ENDIF
</div><div class='add'>+.FPO (9, 4, 0, 0, 1, 0)
</div><div class='ctx'> 
</div><div class='ctx'> ;;; Save registers that the compiler may be using, and adjust esp to
</div><div class='ctx'> ;;; make room for our stack frame.
</div><div class='head'>diff --git a/compat/zlib/contrib/masmx86/mkasm.bat b/compat/zlib/contrib/masmx86/mkasm.bat<br/>deleted file mode 100755<br/>index 70a51f8..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/masmx86/mkasm.bat?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/masmx86/mkasm.bat</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-cl /DASMV /I..\.. /O2 /c gvmat32c.c
</div><div class='del'>-ml /coff /Zi /c /Flgvmat32.lst gvmat32.asm
</div><div class='del'>-ml /coff /Zi /c /Flinffas32.lst inffas32.asm
</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/ChangeLogUnzip b/compat/zlib/contrib/minizip/ChangeLogUnzip<br/>deleted file mode 100644<br/>index 50ca6a9..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/ChangeLogUnzip?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/ChangeLogUnzip</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-Change in 1.01e (12 feb 05)</div><div class='del'>-- Fix in zipOpen2 for globalcomment (Rolf Kalbermatter)</div><div class='del'>-- Fix possible memory leak in unzip.c (Zoran Stevanovic)</div><div class='del'>-</div><div class='del'>-Change in 1.01b (20 may 04)</div><div class='del'>-- Integrate patch from Debian package (submited by Mark Brown)</div><div class='del'>-- Add tools mztools from Xavier Roche</div><div class='del'>-</div><div class='del'>-Change in 1.01 (8 may 04)</div><div class='del'>-- fix buffer overrun risk in unzip.c (Xavier Roche)</div><div class='del'>-- fix a minor buffer insecurity in minizip.c (Mike Whittaker)</div><div class='del'>-</div><div class='del'>-Change in 1.00: (10 sept 03)</div><div class='del'>-- rename to 1.00</div><div class='del'>-- cosmetic code change</div><div class='del'>-</div><div class='del'>-Change in 0.22: (19 May 03)</div><div class='del'>-- crypting support (unless you define NOCRYPT)</div><div class='del'>-- append file in existing zipfile</div><div class='del'>-</div><div class='del'>-Change in 0.21: (10 Mar 03)</div><div class='del'>-- bug fixes</div><div class='del'>-</div><div class='del'>-Change in 0.17: (27 Jan 02)</div><div class='del'>-- bug fixes</div><div class='del'>-</div><div class='del'>-Change in 0.16: (19 Jan 02)</div><div class='del'>-- Support of ioapi for virtualize zip file access</div><div class='del'>-</div><div class='del'>-Change in 0.15: (19 Mar 98)</div><div class='del'>-- fix memory leak in minizip.c</div><div class='del'>-</div><div class='del'>-Change in 0.14: (10 Mar 98)</div><div class='del'>-- fix bugs in minizip.c sample for zipping big file</div><div class='del'>-- fix problem in month in date handling</div><div class='del'>-- fix bug in unzlocal_GetCurrentFileInfoInternal in unzip.c for</div><div class='del'>-    comment handling</div><div class='del'>-</div><div class='del'>-Change in 0.13: (6 Mar 98)</div><div class='del'>-- fix bugs in zip.c</div><div class='del'>-- add real minizip sample</div><div class='del'>-</div><div class='del'>-Change in 0.12: (4 Mar 98)</div><div class='del'>-- add zip.c and zip.h for creates .zip file</div><div class='del'>-- fix change_file_date in miniunz.c for Unix (Jean-loup Gailly)</div><div class='del'>-- fix miniunz.c for file without specific record for directory</div><div class='del'>-</div><div class='del'>-Change in 0.11: (3 Mar 98)</div><div class='del'>-- fix bug in unzGetCurrentFileInfo for get extra field and comment</div><div class='del'>-- enhance miniunz sample, remove the bad unztst.c sample</div><div class='del'>-</div><div class='del'>-Change in 0.10: (2 Mar 98)</div><div class='del'>-- fix bug in unzReadCurrentFile</div><div class='del'>-- rename unzip* to unz* function and structure</div><div class='del'>-- remove Windows-like hungary notation variable name</div><div class='del'>-- modify some structure in unzip.h</div><div class='del'>-- add somes comment in source</div><div class='del'>-- remove unzipGetcCurrentFile function</div><div class='del'>-- replace ZUNZEXPORT by ZEXPORT</div><div class='del'>-- add unzGetLocalExtrafield for get the local extrafield info</div><div class='del'>-- add a new sample, miniunz.c</div><div class='del'>-</div><div class='del'>-Change in 0.4: (25 Feb 98)</div><div class='del'>-- suppress the type unzipFileInZip.</div><div class='del'>-  Only on file in the zipfile can be open at the same time</div><div class='del'>-- fix somes typo in code</div><div class='del'>-- added tm_unz structure in unzip_file_info (date/time in readable format)</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/Makefile.am b/compat/zlib/contrib/minizip/Makefile.am<br/>new file mode 100644<br/>index 0000000..d343011<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/Makefile.am?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/Makefile.am</a></div><div class='hunk'>@@ -0,0 +1,45 @@</div><div class='add'>+lib_LTLIBRARIES = libminizip.la</div><div class='add'>+</div><div class='add'>+if COND_DEMOS</div><div class='add'>+bin_PROGRAMS = miniunzip minizip</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+zlib_top_srcdir = $(top_srcdir)/../..</div><div class='add'>+zlib_top_builddir = $(top_builddir)/../..</div><div class='add'>+</div><div class='add'>+AM_CPPFLAGS = -I$(zlib_top_srcdir)</div><div class='add'>+AM_LDFLAGS = -L$(zlib_top_builddir)</div><div class='add'>+</div><div class='add'>+if WIN32</div><div class='add'>+iowin32_src = iowin32.c</div><div class='add'>+iowin32_h = iowin32.h</div><div class='add'>+endif</div><div class='add'>+</div><div class='add'>+libminizip_la_SOURCES = \</div><div class='add'>+	ioapi.c \</div><div class='add'>+	mztools.c \</div><div class='add'>+	unzip.c \</div><div class='add'>+	zip.c \</div><div class='add'>+	${iowin32_src}</div><div class='add'>+</div><div class='add'>+libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz</div><div class='add'>+</div><div class='add'>+minizip_includedir = $(includedir)/minizip</div><div class='add'>+minizip_include_HEADERS = \</div><div class='add'>+	crypt.h \</div><div class='add'>+	ioapi.h \</div><div class='add'>+	mztools.h \</div><div class='add'>+	unzip.h \</div><div class='add'>+	zip.h \</div><div class='add'>+	${iowin32_h}</div><div class='add'>+</div><div class='add'>+pkgconfigdir = $(libdir)/pkgconfig</div><div class='add'>+pkgconfig_DATA = minizip.pc</div><div class='add'>+</div><div class='add'>+EXTRA_PROGRAMS = miniunzip minizip</div><div class='add'>+</div><div class='add'>+miniunzip_SOURCES = miniunz.c</div><div class='add'>+miniunzip_LDADD = libminizip.la</div><div class='add'>+</div><div class='add'>+minizip_SOURCES = minizip.c</div><div class='add'>+minizip_LDADD = libminizip.la -lz</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/configure.ac b/compat/zlib/contrib/minizip/configure.ac<br/>new file mode 100644<br/>index 0000000..6a9af21<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/configure.ac?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/configure.ac</a></div><div class='hunk'>@@ -0,0 +1,32 @@</div><div class='add'>+#                                               -*- Autoconf -*-</div><div class='add'>+# Process this file with autoconf to produce a configure script.</div><div class='add'>+</div><div class='add'>+AC_INIT([minizip], [1.2.7], [bugzilla.redhat.com])</div><div class='add'>+AC_CONFIG_SRCDIR([minizip.c])</div><div class='add'>+AM_INIT_AUTOMAKE([foreign])</div><div class='add'>+LT_INIT</div><div class='add'>+</div><div class='add'>+AC_MSG_CHECKING([whether to build example programs])</div><div class='add'>+AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs]))</div><div class='add'>+AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes])</div><div class='add'>+if test "$enable_demos" = yes</div><div class='add'>+then</div><div class='add'>+	AC_MSG_RESULT([yes])</div><div class='add'>+else</div><div class='add'>+	AC_MSG_RESULT([no])</div><div class='add'>+fi</div><div class='add'>+</div><div class='add'>+case "${host}" in</div><div class='add'>+	*-mingw* | mingw*)</div><div class='add'>+		WIN32="yes"</div><div class='add'>+		;;</div><div class='add'>+	*)</div><div class='add'>+		;;</div><div class='add'>+esac</div><div class='add'>+AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"])</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+AC_SUBST([HAVE_UNISTD_H], [0])</div><div class='add'>+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])</div><div class='add'>+AC_CONFIG_FILES([Makefile minizip.pc])</div><div class='add'>+AC_OUTPUT</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c<br/>index 49958f6..7f5c191 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/ioapi.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/ioapi.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/ioapi.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/ioapi.c</a></div><div class='hunk'>@@ -10,10 +10,22 @@</div><div class='ctx'> </div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#if (defined(_WIN32))</div><div class='add'>+#if defined(_WIN32) &amp;&amp; (!(defined(_CRT_SECURE_NO_WARNINGS)))</div><div class='ctx'>         #define _CRT_SECURE_NO_WARNINGS</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#if defined(__APPLE__) || defined(IOAPI_NO_64)</div><div class='add'>+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)</div><div class='add'>+#else</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello64(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #include "ioapi.h"</div><div class='ctx'> </div><div class='ctx'> voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)</div><div class='hunk'>@@ -47,7 +59,7 @@ ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream</div><div class='ctx'>     else</div><div class='ctx'>     {</div><div class='ctx'>         uLong tell_uLong = (*(pfilefunc-&gt;ztell32_file))(pfilefunc-&gt;zfile_func64.opaque,filestream);</div><div class='del'>-        if ((tell_uLong) == ((uLong)-1))</div><div class='add'>+        if ((tell_uLong) == MAXU32)</div><div class='ctx'>             return (ZPOS64_T)-1;</div><div class='ctx'>         else</div><div class='ctx'>             return tell_uLong;</div><div class='hunk'>@@ -112,7 +124,7 @@ static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename,</div><div class='ctx'>         mode_fopen = "wb";</div><div class='ctx'> </div><div class='ctx'>     if ((filename!=NULL) &amp;&amp; (mode_fopen != NULL))</div><div class='del'>-        file = fopen64((const char*)filename, mode_fopen);</div><div class='add'>+        file = FOPEN_FUNC((const char*)filename, mode_fopen);</div><div class='ctx'>     return file;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -142,7 +154,7 @@ static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream)</div><div class='ctx'> static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream)</div><div class='ctx'> {</div><div class='ctx'>     ZPOS64_T ret;</div><div class='del'>-    ret = ftello64((FILE *)stream);</div><div class='add'>+    ret = FTELLO_FUNC((FILE *)stream);</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='ctx'> </div><div class='hunk'>@@ -188,7 +200,7 @@ static long ZCALLBACK fseek64_file_func (voidpf  opaque, voidpf stream, ZPOS64_T</div><div class='ctx'>     }</div><div class='ctx'>     ret = 0;</div><div class='ctx'> </div><div class='del'>-    if(fseeko64((FILE *)stream, offset, fseek_origin) != 0)</div><div class='add'>+    if(FSEEKO_FUNC((FILE *)stream, offset, fseek_origin) != 0)</div><div class='ctx'>                         ret = -1;</div><div class='ctx'> </div><div class='ctx'>     return ret;</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/ioapi.h b/compat/zlib/contrib/minizip/ioapi.h<br/>index 8309c4c..8dcbdb0 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/ioapi.h?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/ioapi.h</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/ioapi.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/ioapi.h</a></div><div class='hunk'>@@ -21,7 +21,7 @@</div><div class='ctx'> #ifndef _ZLIBIOAPI64_H</div><div class='ctx'> #define _ZLIBIOAPI64_H</div><div class='ctx'> </div><div class='del'>-#if (!defined(_WIN32)) &amp;&amp; (!defined(WIN32))</div><div class='add'>+#if (!defined(_WIN32)) &amp;&amp; (!defined(WIN32)) &amp;&amp; (!defined(__APPLE__))</div><div class='ctx'> </div><div class='ctx'>   // Linux needs this to support file operation on files larger then 4+GB</div><div class='ctx'>   // But might need better if/def to select just the platforms that needs them.</div><div class='hunk'>@@ -38,6 +38,7 @@</div><div class='ctx'>         #ifndef _FILE_OFFSET_BIT</div><div class='ctx'>                 #define _FILE_OFFSET_BIT 64</div><div class='ctx'>         #endif</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='hunk'>@@ -49,6 +50,11 @@</div><div class='ctx'> #define ftello64 ftell</div><div class='ctx'> #define fseeko64 fseek</div><div class='ctx'> #else</div><div class='add'>+#ifdef __FreeBSD__</div><div class='add'>+#define fopen64 fopen</div><div class='add'>+#define ftello64 ftello</div><div class='add'>+#define fseeko64 fseeko</div><div class='add'>+#endif</div><div class='ctx'> #ifdef _MSC_VER</div><div class='ctx'>  #define fopen64 fopen</div><div class='ctx'>  #if (_MSC_VER &gt;= 1400) &amp;&amp; (!(defined(NO_MSCVER_FILE64_FUNC)))</div><div class='hunk'>@@ -85,6 +91,8 @@ typedef  64BIT_INT_CUSTOM_TYPE ZPOS64_T;</div><div class='ctx'> typedef uint64_t ZPOS64_T;</div><div class='ctx'> #else</div><div class='ctx'> </div><div class='add'>+/* Maximum unsigned 32-bit value used as placeholder for zip64 */</div><div class='add'>+#define MAXU32 0xffffffff</div><div class='ctx'> </div><div class='ctx'> #if defined(_MSC_VER) || defined(__BORLANDC__)</div><div class='ctx'> typedef unsigned __int64 ZPOS64_T;</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/miniunz.c b/compat/zlib/contrib/minizip/miniunz.c<br/>index 9ed009f..3d65401 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/miniunz.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/miniunz.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/miniunz.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/miniunz.c</a></div><div class='hunk'>@@ -12,7 +12,7 @@</div><div class='ctx'>          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )</div><div class='ctx'> */</div><div class='ctx'> </div><div class='del'>-#ifndef _WIN32</div><div class='add'>+#if (!defined(_WIN32)) &amp;&amp; (!defined(WIN32)) &amp;&amp; (!defined(__APPLE__))</div><div class='ctx'>         #ifndef __USE_FILE_OFFSET64</div><div class='ctx'>                 #define __USE_FILE_OFFSET64</div><div class='ctx'>         #endif</div><div class='hunk'>@@ -27,6 +27,18 @@</div><div class='ctx'>         #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef __APPLE__</div><div class='add'>+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)</div><div class='add'>+#else</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello64(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='hunk'>@@ -34,14 +46,15 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef unix</div><div class='del'>-# include &lt;unistd.h&gt;</div><div class='del'>-# include &lt;utime.h&gt;</div><div class='del'>-#else</div><div class='add'>+#ifdef _WIN32</div><div class='ctx'> # include &lt;direct.h&gt;</div><div class='ctx'> # include &lt;io.h&gt;</div><div class='add'>+#else</div><div class='add'>+# include &lt;unistd.h&gt;</div><div class='add'>+# include &lt;utime.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+</div><div class='ctx'> #include "unzip.h"</div><div class='ctx'> </div><div class='ctx'> #define CASESENSITIVITY (0)</div><div class='hunk'>@@ -84,7 +97,7 @@ void change_file_date(filename,dosdate,tmu_date)</div><div class='ctx'>   SetFileTime(hFile,&amp;ftm,&amp;ftLastAcc,&amp;ftm);</div><div class='ctx'>   CloseHandle(hFile);</div><div class='ctx'> #else</div><div class='del'>-#ifdef unix</div><div class='add'>+#ifdef unix || __APPLE__</div><div class='ctx'>   struct utimbuf ut;</div><div class='ctx'>   struct tm newdate;</div><div class='ctx'>   newdate.tm_sec = tmu_date.tm_sec;</div><div class='hunk'>@@ -114,10 +127,10 @@ int mymkdir(dirname)</div><div class='ctx'>     int ret=0;</div><div class='ctx'> #ifdef _WIN32</div><div class='ctx'>     ret = _mkdir(dirname);</div><div class='del'>-#else</div><div class='del'>-#ifdef unix</div><div class='add'>+#elif unix</div><div class='add'>+    ret = mkdir (dirname,0775);</div><div class='add'>+#elif __APPLE__</div><div class='ctx'>     ret = mkdir (dirname,0775);</div><div class='del'>-#endif</div><div class='ctx'> #endif</div><div class='ctx'>     return ret;</div><div class='ctx'> }</div><div class='hunk'>@@ -364,7 +377,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)</div><div class='ctx'>         {</div><div class='ctx'>             char rep=0;</div><div class='ctx'>             FILE* ftestexist;</div><div class='del'>-            ftestexist = fopen64(write_filename,"rb");</div><div class='add'>+            ftestexist = FOPEN_FUNC(write_filename,"rb");</div><div class='ctx'>             if (ftestexist!=NULL)</div><div class='ctx'>             {</div><div class='ctx'>                 fclose(ftestexist);</div><div class='hunk'>@@ -395,8 +408,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)</div><div class='ctx'> </div><div class='ctx'>         if ((skip==0) &amp;&amp; (err==UNZ_OK))</div><div class='ctx'>         {</div><div class='del'>-            fout=fopen64(write_filename,"wb");</div><div class='del'>-</div><div class='add'>+            fout=FOPEN_FUNC(write_filename,"wb");</div><div class='ctx'>             /* some zipfile don't contain directory alone before file */</div><div class='ctx'>             if ((fout==NULL) &amp;&amp; ((*popt_extract_without_path)==0) &amp;&amp;</div><div class='ctx'>                                 (filename_withoutpath!=(char*)filename_inzip))</div><div class='hunk'>@@ -405,7 +417,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)</div><div class='ctx'>                 *(filename_withoutpath-1)='\0';</div><div class='ctx'>                 makedir(write_filename);</div><div class='ctx'>                 *(filename_withoutpath-1)=c;</div><div class='del'>-                fout=fopen64(write_filename,"wb");</div><div class='add'>+                fout=FOPEN_FUNC(write_filename,"wb");</div><div class='ctx'>             }</div><div class='ctx'> </div><div class='ctx'>             if (fout==NULL)</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c<br/>index 7a4fa5a..4288962 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/minizip.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/minizip.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/minizip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/minizip.c</a></div><div class='hunk'>@@ -13,7 +13,7 @@</div><div class='ctx'> */</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-#ifndef _WIN32</div><div class='add'>+#if (!defined(_WIN32)) &amp;&amp; (!defined(WIN32)) &amp;&amp; (!defined(__APPLE__))</div><div class='ctx'>         #ifndef __USE_FILE_OFFSET64</div><div class='ctx'>                 #define __USE_FILE_OFFSET64</div><div class='ctx'>         #endif</div><div class='hunk'>@@ -28,6 +28,19 @@</div><div class='ctx'>         #endif</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='add'>+#ifdef __APPLE__</div><div class='add'>+// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)</div><div class='add'>+#else</div><div class='add'>+#define FOPEN_FUNC(filename, mode) fopen64(filename, mode)</div><div class='add'>+#define FTELLO_FUNC(stream) ftello64(stream)</div><div class='add'>+#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #include &lt;stdio.h&gt;</div><div class='ctx'> #include &lt;stdlib.h&gt;</div><div class='ctx'> #include &lt;string.h&gt;</div><div class='hunk'>@@ -35,14 +48,14 @@</div><div class='ctx'> #include &lt;errno.h&gt;</div><div class='ctx'> #include &lt;fcntl.h&gt;</div><div class='ctx'> </div><div class='del'>-#ifdef unix</div><div class='add'>+#ifdef _WIN32</div><div class='add'>+# include &lt;direct.h&gt;</div><div class='add'>+# include &lt;io.h&gt;</div><div class='add'>+#else</div><div class='ctx'> # include &lt;unistd.h&gt;</div><div class='ctx'> # include &lt;utime.h&gt;</div><div class='ctx'> # include &lt;sys/types.h&gt;</div><div class='ctx'> # include &lt;sys/stat.h&gt;</div><div class='del'>-#else</div><div class='del'>-# include &lt;direct.h&gt;</div><div class='del'>-# include &lt;io.h&gt;</div><div class='ctx'> #endif</div><div class='ctx'> </div><div class='ctx'> #include "zip.h"</div><div class='hunk'>@@ -81,7 +94,7 @@ uLong filetime(f, tmzip, dt)</div><div class='ctx'>   return ret;</div><div class='ctx'> }</div><div class='ctx'> #else</div><div class='del'>-#ifdef unix</div><div class='add'>+#ifdef unix || __APPLE__</div><div class='ctx'> uLong filetime(f, tmzip, dt)</div><div class='ctx'>     char *f;               /* name of file to get info on */</div><div class='ctx'>     tm_zip *tmzip;         /* return value: access, modific. and creation times */</div><div class='hunk'>@@ -142,7 +155,7 @@ int check_exist_file(filename)</div><div class='ctx'> {</div><div class='ctx'>     FILE* ftestexist;</div><div class='ctx'>     int ret = 1;</div><div class='del'>-    ftestexist = fopen64(filename,"rb");</div><div class='add'>+    ftestexist = FOPEN_FUNC(filename,"rb");</div><div class='ctx'>     if (ftestexist==NULL)</div><div class='ctx'>         ret = 0;</div><div class='ctx'>     else</div><div class='hunk'>@@ -173,7 +186,8 @@ int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigne</div><div class='ctx'> {</div><div class='ctx'>    unsigned long calculate_crc=0;</div><div class='ctx'>    int err=ZIP_OK;</div><div class='del'>-   FILE * fin = fopen64(filenameinzip,"rb");</div><div class='add'>+   FILE * fin = FOPEN_FUNC(filenameinzip,"rb");</div><div class='add'>+</div><div class='ctx'>    unsigned long size_read = 0;</div><div class='ctx'>    unsigned long total_read = 0;</div><div class='ctx'>    if (fin==NULL)</div><div class='hunk'>@@ -211,13 +225,12 @@ int isLargeFile(const char* filename)</div><div class='ctx'> {</div><div class='ctx'>   int largeFile = 0;</div><div class='ctx'>   ZPOS64_T pos = 0;</div><div class='del'>-  FILE* pFile = fopen64(filename, "rb");</div><div class='add'>+  FILE* pFile = FOPEN_FUNC(filename, "rb");</div><div class='ctx'> </div><div class='ctx'>   if(pFile != NULL)</div><div class='ctx'>   {</div><div class='del'>-    int n = fseeko64(pFile, 0, SEEK_END);</div><div class='del'>-</div><div class='del'>-    pos = ftello64(pFile);</div><div class='add'>+    int n = FSEEKO_FUNC(pFile, 0, SEEK_END);</div><div class='add'>+    pos = FTELLO_FUNC(pFile);</div><div class='ctx'> </div><div class='ctx'>                 printf("File : %s is %lld bytes\n", filename, pos);</div><div class='ctx'> </div><div class='hunk'>@@ -447,7 +460,7 @@ int main(argc,argv)</div><div class='ctx'>                     printf("error in opening %s in zipfile\n",filenameinzip);</div><div class='ctx'>                 else</div><div class='ctx'>                 {</div><div class='del'>-                    fin = fopen64(filenameinzip,"rb");</div><div class='add'>+                    fin = FOPEN_FUNC(filenameinzip,"rb");</div><div class='ctx'>                     if (fin==NULL)</div><div class='ctx'>                     {</div><div class='ctx'>                         err=ZIP_ERRNO;</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/minizip.pc.in b/compat/zlib/contrib/minizip/minizip.pc.in<br/>new file mode 100644<br/>index 0000000..69b5b7f<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/minizip.pc.in?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/minizip.pc.in</a></div><div class='hunk'>@@ -0,0 +1,12 @@</div><div class='add'>+prefix=@prefix@</div><div class='add'>+exec_prefix=@exec_prefix@</div><div class='add'>+libdir=@libdir@</div><div class='add'>+includedir=@includedir@/minizip</div><div class='add'>+</div><div class='add'>+Name: minizip</div><div class='add'>+Description: Minizip zip file manipulation library</div><div class='add'>+Requires:</div><div class='add'>+Version: @PACKAGE_VERSION@</div><div class='add'>+Libs: -L${libdir} -lminizip</div><div class='add'>+Libs.private: -lz</div><div class='add'>+Cflags: -I${includedir}</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/mztools.c b/compat/zlib/contrib/minizip/mztools.c<br/>index f9092e6..96891c2 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/mztools.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/mztools.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/mztools.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/mztools.c</a></div><div class='hunk'>@@ -42,7 +42,7 @@ uLong* bytesRecovered;</div><div class='ctx'>     int entries = 0;</div><div class='ctx'>     uLong totalBytes = 0;</div><div class='ctx'>     char header[30];</div><div class='del'>-    char filename[256];</div><div class='add'>+    char filename[1024];</div><div class='ctx'>     char extra[1024];</div><div class='ctx'>     int offset = 0;</div><div class='ctx'>     int offsetCD = 0;</div><div class='hunk'>@@ -73,9 +73,14 @@ uLong* bytesRecovered;</div><div class='ctx'> </div><div class='ctx'>         /* Filename */</div><div class='ctx'>         if (fnsize &gt; 0) {</div><div class='del'>-          if (fread(filename, 1, fnsize, fpZip) == fnsize) {</div><div class='del'>-            if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {</div><div class='del'>-              offset += fnsize;</div><div class='add'>+          if (fnsize &lt; sizeof(filename)) {</div><div class='add'>+            if (fread(filename, 1, fnsize, fpZip) == fnsize) {</div><div class='add'>+                if (fwrite(filename, 1, fnsize, fpOut) == fnsize) {</div><div class='add'>+                offset += fnsize;</div><div class='add'>+              } else {</div><div class='add'>+                err = Z_ERRNO;</div><div class='add'>+                break;</div><div class='add'>+              }</div><div class='ctx'>             } else {</div><div class='ctx'>               err = Z_ERRNO;</div><div class='ctx'>               break;</div><div class='hunk'>@@ -91,9 +96,14 @@ uLong* bytesRecovered;</div><div class='ctx'> </div><div class='ctx'>         /* Extra field */</div><div class='ctx'>         if (extsize &gt; 0) {</div><div class='del'>-          if (fread(extra, 1, extsize, fpZip) == extsize) {</div><div class='del'>-            if (fwrite(extra, 1, extsize, fpOut) == extsize) {</div><div class='del'>-              offset += extsize;</div><div class='add'>+          if (extsize &lt; sizeof(extra)) {</div><div class='add'>+            if (fread(extra, 1, extsize, fpZip) == extsize) {</div><div class='add'>+              if (fwrite(extra, 1, extsize, fpOut) == extsize) {</div><div class='add'>+                offset += extsize;</div><div class='add'>+                } else {</div><div class='add'>+                err = Z_ERRNO;</div><div class='add'>+                break;</div><div class='add'>+              }</div><div class='ctx'>             } else {</div><div class='ctx'>               err = Z_ERRNO;</div><div class='ctx'>               break;</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/mztools.h b/compat/zlib/contrib/minizip/mztools.h<br/>index 88b3459..a49a426 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/mztools.h?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/mztools.h</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/mztools.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/mztools.h</a></div><div class='hunk'>@@ -28,4 +28,10 @@ extern int ZEXPORT unzRepair(const char* file,</div><div class='ctx'>                              uLong* nRecovered,</div><div class='ctx'>                              uLong* bytesRecovered);</div><div class='ctx'> </div><div class='add'>+</div><div class='add'>+#ifdef __cplusplus</div><div class='add'>+}</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+</div><div class='ctx'> #endif</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/unzip.c b/compat/zlib/contrib/minizip/unzip.c<br/>index 7617f41..affad4b 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/unzip.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/unzip.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/unzip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/unzip.c</a></div><div class='hunk'>@@ -1040,26 +1040,26 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file,</div><div class='ctx'>             {</div><div class='ctx'>                                                         uLong uL;</div><div class='ctx'> </div><div class='del'>-                                                                if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1)</div><div class='add'>+                                                                if(file_info.uncompressed_size == MAXU32)</div><div class='ctx'>                                                                 {</div><div class='ctx'>                                                                         if (unz64local_getLong64(&amp;s-&gt;z_filefunc, s-&gt;filestream,&amp;file_info.uncompressed_size) != UNZ_OK)</div><div class='ctx'>                                                                                         err=UNZ_ERRNO;</div><div class='ctx'>                                                                 }</div><div class='ctx'> </div><div class='del'>-                                                                if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1)</div><div class='add'>+                                                                if(file_info.compressed_size == MAXU32)</div><div class='ctx'>                                                                 {</div><div class='ctx'>                                                                         if (unz64local_getLong64(&amp;s-&gt;z_filefunc, s-&gt;filestream,&amp;file_info.compressed_size) != UNZ_OK)</div><div class='ctx'>                                                                                   err=UNZ_ERRNO;</div><div class='ctx'>                                                                 }</div><div class='ctx'> </div><div class='del'>-                                                                if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1)</div><div class='add'>+                                                                if(file_info_internal.offset_curfile == MAXU32)</div><div class='ctx'>                                                                 {</div><div class='ctx'>                                                                         /* Relative Header offset */</div><div class='ctx'>                                                                         if (unz64local_getLong64(&amp;s-&gt;z_filefunc, s-&gt;filestream,&amp;file_info_internal.offset_curfile) != UNZ_OK)</div><div class='ctx'>                                                                                 err=UNZ_ERRNO;</div><div class='ctx'>                                                                 }</div><div class='ctx'> </div><div class='del'>-                                                                if(file_info.disk_num_start == (unsigned long)-1)</div><div class='add'>+                                                                if(file_info.disk_num_start == MAXU32)</div><div class='ctx'>                                                                 {</div><div class='ctx'>                                                                         /* Disk Start Number */</div><div class='ctx'>                                                                         if (unz64local_getLong(&amp;s-&gt;z_filefunc, s-&gt;filestream,&amp;uL) != UNZ_OK)</div><div class='hunk'>@@ -1145,7 +1145,7 @@ extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,</div><div class='ctx'>                                                 szFileName,fileNameBufferSize,</div><div class='ctx'>                                                 extraField,extraFieldBufferSize,</div><div class='ctx'>                                                 szComment,commentBufferSize);</div><div class='del'>-    if (err==UNZ_OK)</div><div class='add'>+    if ((err==UNZ_OK) &amp;&amp; (pfile_info != NULL))</div><div class='ctx'>     {</div><div class='ctx'>         pfile_info-&gt;version = file_info64.version;</div><div class='ctx'>         pfile_info-&gt;version_needed = file_info64.version_needed;</div><div class='hunk'>@@ -1696,7 +1696,7 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)</div><div class='ctx'>         return UNZ_PARAMERROR;</div><div class='ctx'> </div><div class='ctx'> </div><div class='del'>-    if ((pfile_in_zip_read_info-&gt;read_buffer == NULL))</div><div class='add'>+    if (pfile_in_zip_read_info-&gt;read_buffer == NULL)</div><div class='ctx'>         return UNZ_END_OF_LIST_OF_FILE;</div><div class='ctx'>     if (len==0)</div><div class='ctx'>         return 0;</div><div class='head'>diff --git a/compat/zlib/contrib/minizip/zip.c b/compat/zlib/contrib/minizip/zip.c<br/>index 3c34fc8..147934c 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/zip.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/minizip/zip.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/minizip/zip.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/minizip/zip.c</a></div><div class='hunk'>@@ -1067,6 +1067,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,</div><div class='ctx'>     int err = ZIP_OK;</div><div class='ctx'> </div><div class='ctx'> #    ifdef NOCRYPT</div><div class='add'>+    (crcForCrypting);</div><div class='ctx'>     if (password != NULL)</div><div class='ctx'>         return ZIP_PARAMERROR;</div><div class='ctx'> #    endif</div><div class='hunk'>@@ -1114,9 +1115,9 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,</div><div class='ctx'>     zi-&gt;ci.flag = flagBase;</div><div class='ctx'>     if ((level==8) || (level==9))</div><div class='ctx'>       zi-&gt;ci.flag |= 2;</div><div class='del'>-    if ((level==2))</div><div class='add'>+    if (level==2)</div><div class='ctx'>       zi-&gt;ci.flag |= 4;</div><div class='del'>-    if ((level==1))</div><div class='add'>+    if (level==1)</div><div class='ctx'>       zi-&gt;ci.flag |= 6;</div><div class='ctx'>     if (password != NULL)</div><div class='ctx'>       zi-&gt;ci.flag |= 1;</div><div class='hunk'>@@ -1710,7 +1711,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s</div><div class='ctx'>         if (err==ZIP_OK)</div><div class='ctx'>             err = zip64local_putValue(&amp;zi-&gt;z_filefunc,zi-&gt;filestream,crc32,4); /* crc 32, unknown */</div><div class='ctx'> </div><div class='del'>-        if(uncompressed_size &gt;= 0xffffffff)</div><div class='add'>+        if(uncompressed_size &gt;= 0xffffffff || compressed_size &gt;= 0xffffffff )</div><div class='ctx'>         {</div><div class='ctx'>           if(zi-&gt;ci.pos_zip64extrainfo &gt; 0)</div><div class='ctx'>           {</div><div class='hunk'>@@ -1724,6 +1725,8 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s</div><div class='ctx'>             if (err==ZIP_OK) /* uncompressed size, unknown */</div><div class='ctx'>               err = zip64local_putValue(&amp;zi-&gt;z_filefunc, zi-&gt;filestream, compressed_size, 8);</div><div class='ctx'>           }</div><div class='add'>+          else</div><div class='add'>+              err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -&gt; fatal</div><div class='ctx'>         }</div><div class='ctx'>         else</div><div class='ctx'>         {</div><div class='hunk'>@@ -1852,7 +1855,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir,</div><div class='ctx'>       err = zip64local_putValue(&amp;zi-&gt;z_filefunc,zi-&gt;filestream, (uLong)0xffffffff,4);</div><div class='ctx'>     }</div><div class='ctx'>     else</div><div class='del'>-                  err = zip64local_putValue(&amp;zi-&gt;z_filefunc,zi-&gt;filestream, (uLong)(centraldir_pos_inzip - zi-&gt;add_position_when_writting_offset),4);</div><div class='add'>+      err = zip64local_putValue(&amp;zi-&gt;z_filefunc,zi-&gt;filestream, (uLong)(centraldir_pos_inzip - zi-&gt;add_position_when_writting_offset),4);</div><div class='ctx'>   }</div><div class='ctx'> </div><div class='ctx'>    return err;</div><div class='hunk'>@@ -1919,7 +1922,7 @@ extern int ZEXPORT zipClose (zipFile file, const char* global_comment)</div><div class='ctx'>     free_linkedlist(&amp;(zi-&gt;central_dir));</div><div class='ctx'> </div><div class='ctx'>     pos = centraldir_pos_inzip - zi-&gt;add_position_when_writting_offset;</div><div class='del'>-    if(pos &gt;= 0xffffffff)</div><div class='add'>+    if(pos &gt;= 0xffffffff || zi-&gt;number_entry &gt; 0xFFFF)</div><div class='ctx'>     {</div><div class='ctx'>       ZPOS64_T Zip64EOCDpos = ZTELL64(zi-&gt;z_filefunc,zi-&gt;filestream);</div><div class='ctx'>       Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);</div><div class='head'>diff --git a/compat/zlib/contrib/pascal/zlibd32.mak b/compat/zlib/contrib/pascal/zlibd32.mak<br/>index 0d0699a..9bb00b7 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/pascal/zlibd32.mak?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/pascal/zlibd32.mak</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/pascal/zlibd32.mak?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/pascal/zlibd32.mak</a></div><div class='hunk'>@@ -63,9 +63,9 @@ uncompr.obj: uncompr.c zlib.h zconf.h</div><div class='ctx'> </div><div class='ctx'> zutil.obj: zutil.c zutil.h zlib.h zconf.h</div><div class='ctx'> </div><div class='del'>-example.obj: example.c zlib.h zconf.h</div><div class='add'>+example.obj: test/example.c zlib.h zconf.h</div><div class='ctx'> </div><div class='del'>-minigzip.obj: minigzip.c zlib.h zconf.h</div><div class='add'>+minigzip.obj: test/minigzip.c zlib.h zconf.h</div><div class='ctx'> </div><div class='ctx'> </div><div class='ctx'> # For the sake of the old Borland make,</div><div class='head'>diff --git a/compat/zlib/contrib/pascal/zlibpas.pas b/compat/zlib/contrib/pascal/zlibpas.pas<br/>index 637ae3a..7abd862 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/pascal/zlibpas.pas?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/pascal/zlibpas.pas</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/pascal/zlibpas.pas?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/pascal/zlibpas.pas</a></div><div class='hunk'>@@ -10,7 +10,8 @@ unit zlibpas;</div><div class='ctx'> interface</div><div class='ctx'> </div><div class='ctx'> const</div><div class='del'>-  ZLIB_VERSION = '1.2.5';</div><div class='add'>+  ZLIB_VERSION = '1.2.7';</div><div class='add'>+  ZLIB_VERNUM  = $1270;</div><div class='ctx'> </div><div class='ctx'> type</div><div class='ctx'>   alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;</div><div class='hunk'>@@ -45,6 +46,23 @@ type</div><div class='ctx'>     reserved: LongInt;    (* reserved for future use *)</div><div class='ctx'>   end;</div><div class='ctx'> </div><div class='add'>+  gz_headerp = ^gz_header;</div><div class='add'>+  gz_header = packed record</div><div class='add'>+    text: Integer;        (* true if compressed data believed to be text *)</div><div class='add'>+    time: LongInt;        (* modification time *)</div><div class='add'>+    xflags: Integer;      (* extra flags (not used when writing a gzip file) *)</div><div class='add'>+    os: Integer;          (* operating system *)</div><div class='add'>+    extra: PChar;         (* pointer to extra field or Z_NULL if none *)</div><div class='add'>+    extra_len: Integer;   (* extra field length (valid if extra != Z_NULL) *)</div><div class='add'>+    extra_max: Integer;   (* space at extra (only when reading header) *)</div><div class='add'>+    name: PChar;          (* pointer to zero-terminated file name or Z_NULL *)</div><div class='add'>+    name_max: Integer;    (* space at name (only when reading header) *)</div><div class='add'>+    comment: PChar;       (* pointer to zero-terminated comment or Z_NULL *)</div><div class='add'>+    comm_max: Integer;    (* space at comment (only when reading header) *)</div><div class='add'>+    hcrc: Integer;        (* true if there was or will be a header crc *)</div><div class='add'>+    done: Integer;        (* true when done reading gzip header *)</div><div class='add'>+  end;</div><div class='add'>+</div><div class='ctx'> (* constants *)</div><div class='ctx'> const</div><div class='ctx'>   Z_NO_FLUSH      = 0;</div><div class='hunk'>@@ -52,6 +70,8 @@ const</div><div class='ctx'>   Z_SYNC_FLUSH    = 2;</div><div class='ctx'>   Z_FULL_FLUSH    = 3;</div><div class='ctx'>   Z_FINISH        = 4;</div><div class='add'>+  Z_BLOCK         = 5;</div><div class='add'>+  Z_TREES         = 6;</div><div class='ctx'> </div><div class='ctx'>   Z_OK            =  0;</div><div class='ctx'>   Z_STREAM_END    =  1;</div><div class='hunk'>@@ -71,9 +91,11 @@ const</div><div class='ctx'>   Z_FILTERED            = 1;</div><div class='ctx'>   Z_HUFFMAN_ONLY        = 2;</div><div class='ctx'>   Z_RLE                 = 3;</div><div class='add'>+  Z_FIXED               = 4;</div><div class='ctx'>   Z_DEFAULT_STRATEGY    = 0;</div><div class='ctx'> </div><div class='ctx'>   Z_BINARY   = 0;</div><div class='add'>+  Z_TEXT     = 1;</div><div class='ctx'>   Z_ASCII    = 1;</div><div class='ctx'>   Z_UNKNOWN  = 2;</div><div class='ctx'> </div><div class='hunk'>@@ -96,14 +118,21 @@ function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;</div><div class='ctx'> function deflateCopy(var dest, source: z_stream): Integer;</div><div class='ctx'> function deflateReset(var strm: z_stream): Integer;</div><div class='ctx'> function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;</div><div class='add'>+function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer;</div><div class='ctx'> function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;</div><div class='add'>+function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer;</div><div class='ctx'> function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;</div><div class='add'>+function deflateSetHeader(var strm: z_stream; head: gz_header): Integer;</div><div class='ctx'> function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;</div><div class='ctx'> function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;</div><div class='ctx'>                               dictLength: Integer): Integer;</div><div class='ctx'> function inflateSync(var strm: z_stream): Integer;</div><div class='ctx'> function inflateCopy(var dest, source: z_stream): Integer;</div><div class='ctx'> function inflateReset(var strm: z_stream): Integer;</div><div class='add'>+function inflateReset2(var strm: z_stream; windowBits: Integer): Integer;</div><div class='add'>+function inflatePrime(var strm: z_stream; bits, value: Integer): Integer;</div><div class='add'>+function inflateMark(var strm: z_stream): LongInt;</div><div class='add'>+function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer;</div><div class='ctx'> function inflateBackInit(var strm: z_stream;</div><div class='ctx'>                          windowBits: Integer; window: PChar): Integer;</div><div class='ctx'> function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;</div><div class='hunk'>@@ -123,7 +152,9 @@ function uncompress(dest: PChar; var destLen: LongInt;</div><div class='ctx'> </div><div class='ctx'> (* checksum functions *)</div><div class='ctx'> function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;</div><div class='add'>+function adler32_combine(adler1, adler2, len2: LongInt): LongInt;</div><div class='ctx'> function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;</div><div class='add'>+function crc32_combine(crc1, crc2, len2: LongInt): LongInt;</div><div class='ctx'> </div><div class='ctx'> (* various hacks, don't look :) *)</div><div class='ctx'> function deflateInit_(var strm: z_stream; level: Integer;</div><div class='hunk'>@@ -155,10 +186,12 @@ implementation</div><div class='ctx'> {$L zutil.obj}</div><div class='ctx'> </div><div class='ctx'> function adler32; external;</div><div class='add'>+function adler32_combine; external;</div><div class='ctx'> function compress; external;</div><div class='ctx'> function compress2; external;</div><div class='ctx'> function compressBound; external;</div><div class='ctx'> function crc32; external;</div><div class='add'>+function crc32_combine; external;</div><div class='ctx'> function deflate; external;</div><div class='ctx'> function deflateBound; external;</div><div class='ctx'> function deflateCopy; external;</div><div class='hunk'>@@ -166,18 +199,25 @@ function deflateEnd; external;</div><div class='ctx'> function deflateInit_; external;</div><div class='ctx'> function deflateInit2_; external;</div><div class='ctx'> function deflateParams; external;</div><div class='add'>+function deflatePending; external;</div><div class='ctx'> function deflatePrime; external;</div><div class='ctx'> function deflateReset; external;</div><div class='ctx'> function deflateSetDictionary; external;</div><div class='add'>+function deflateSetHeader; external;</div><div class='add'>+function deflateTune; external;</div><div class='ctx'> function inflate; external;</div><div class='ctx'> function inflateBack; external;</div><div class='ctx'> function inflateBackEnd; external;</div><div class='ctx'> function inflateBackInit_; external;</div><div class='ctx'> function inflateCopy; external;</div><div class='ctx'> function inflateEnd; external;</div><div class='add'>+function inflateGetHeader; external;</div><div class='ctx'> function inflateInit_; external;</div><div class='ctx'> function inflateInit2_; external;</div><div class='add'>+function inflateMark; external;</div><div class='add'>+function inflatePrime; external;</div><div class='ctx'> function inflateReset; external;</div><div class='add'>+function inflateReset2; external;</div><div class='ctx'> function inflateSetDictionary; external;</div><div class='ctx'> function inflateSync; external;</div><div class='ctx'> function uncompress; external;</div><div class='head'>diff --git a/compat/zlib/contrib/puff/Makefile b/compat/zlib/contrib/puff/Makefile<br/>index b6b6940..0e2594c 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/Makefile?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/puff/Makefile</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/Makefile?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/Makefile</a></div><div class='hunk'>@@ -1,8 +1,42 @@</div><div class='del'>-puff: puff.c puff.h</div><div class='del'>-	cc -DTEST -o puff puff.c</div><div class='add'>+CFLAGS=-O</div><div class='add'>+</div><div class='add'>+puff: puff.o pufftest.o</div><div class='add'>+</div><div class='add'>+puff.o: puff.h</div><div class='add'>+</div><div class='add'>+pufftest.o: puff.h</div><div class='ctx'> </div><div class='ctx'> test: puff</div><div class='ctx'> 	puff zeros.raw</div><div class='ctx'> </div><div class='add'>+puft: puff.c puff.h pufftest.o</div><div class='add'>+	cc -fprofile-arcs -ftest-coverage -o puft puff.c pufftest.o</div><div class='add'>+</div><div class='add'>+# puff full coverage test (should say 100%)</div><div class='add'>+cov: puft</div><div class='add'>+	@rm -f *.gcov *.gcda</div><div class='add'>+	@puft -w zeros.raw 2&gt;&amp;1 | cat &gt; /dev/null</div><div class='add'>+	@echo '04' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 2</div><div class='add'>+	@echo '00' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 2</div><div class='add'>+	@echo '00 00 00 00 00' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 254</div><div class='add'>+	@echo '00 01 00 fe ff' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 2</div><div class='add'>+	@echo '01 01 00 fe ff 0a' | xxd -r -p | puft -f 2&gt;&amp;1 | cat &gt; /dev/null</div><div class='add'>+	@echo '02 7e ff ff' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 246</div><div class='add'>+	@echo '02' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 2</div><div class='add'>+	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 04' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 2</div><div class='add'>+	@echo '04 80 49 92 24 49 92 24 71 ff ff 93 11 00' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 249</div><div class='add'>+	@echo '04 c0 81 08 00 00 00 00 20 7f eb 0b 00 00' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 246</div><div class='add'>+	@echo '0b 00 00' | xxd -r -p | puft -f 2&gt;&amp;1 | cat &gt; /dev/null</div><div class='add'>+	@echo '1a 07' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 246</div><div class='add'>+	@echo '0c c0 81 00 00 00 00 00 90 ff 6b 04' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 245</div><div class='add'>+	@puft -f zeros.raw 2&gt;&amp;1 | cat &gt; /dev/null</div><div class='add'>+	@echo 'fc 00 00' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 253</div><div class='add'>+	@echo '04 00 fe ff' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 252</div><div class='add'>+	@echo '04 00 24 49' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 251</div><div class='add'>+	@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 84' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 248</div><div class='add'>+	@echo '04 00 24 e9 ff ff' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 250</div><div class='add'>+	@echo '04 00 24 e9 ff 6d' | xxd -r -p | puft 2&gt; /dev/null || test $$? -eq 247</div><div class='add'>+	@gcov -n puff.c</div><div class='add'>+</div><div class='ctx'> clean:</div><div class='del'>-	rm -f puff puff.o</div><div class='add'>+	rm -f puff puft *.o *.gc*</div><div class='head'>diff --git a/compat/zlib/contrib/puff/puff.c b/compat/zlib/contrib/puff/puff.c<br/>index 650694e..df8470c 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/puff.c?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/puff/puff.c</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/puff.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/puff.c</a></div><div class='hunk'>@@ -2,7 +2,7 @@</div><div class='ctx'>  * puff.c</div><div class='ctx'>  * Copyright (C) 2002-2010 Mark Adler</div><div class='ctx'>  * For conditions of distribution and use, see copyright notice in puff.h</div><div class='del'>- * version 2.1, 4 Apr 2010</div><div class='add'>+ * version 2.2, 25 Apr 2010</div><div class='ctx'>  *</div><div class='ctx'>  * puff.c is a simple inflate written to be an unambiguous way to specify the</div><div class='ctx'>  * deflate format.  It is not written for speed but rather simplicity.  As a</div><div class='hunk'>@@ -49,9 +49,9 @@</div><div class='ctx'>  *                      - Fix fixed codes table error</div><div class='ctx'>  *                      - Provide a scanning mode for determining size of</div><div class='ctx'>  *                        uncompressed data</div><div class='del'>- * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Jean-loup]</div><div class='add'>+ * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Gailly]</div><div class='ctx'>  *                      - Add a puff.h file for the interface</div><div class='del'>- *                      - Add braces in puff() for else do [Jean-loup]</div><div class='add'>+ *                      - Add braces in puff() for else do [Gailly]</div><div class='ctx'>  *                      - Use indexes instead of pointers for readability</div><div class='ctx'>  * 1.4  31 Mar 2002     - Simplify construct() code set check</div><div class='ctx'>  *                      - Fix some comments</div><div class='hunk'>@@ -69,13 +69,19 @@</div><div class='ctx'>  *                      - Allow TEST code to read from piped stdin</div><div class='ctx'>  * 2.1   4 Apr 2010     - Avoid variable initialization for happier compilers</div><div class='ctx'>  *                      - Avoid unsigned comparisons for even happier compilers</div><div class='add'>+ * 2.2  25 Apr 2010     - Fix bug in variable initializations [Oberhumer]</div><div class='add'>+ *                      - Add const where appropriate [Oberhumer]</div><div class='add'>+ *                      - Split if's and ?'s for coverage testing</div><div class='add'>+ *                      - Break out test code to separate file</div><div class='add'>+ *                      - Move NIL to puff.h</div><div class='add'>+ *                      - Allow incomplete code only if single code length is 1</div><div class='add'>+ *                      - Add full code coverage test to Makefile</div><div class='ctx'>  */</div><div class='ctx'> </div><div class='ctx'> #include &lt;setjmp.h&gt;             /* for setjmp(), longjmp(), and jmp_buf */</div><div class='ctx'> #include "puff.h"               /* prototype for puff() */</div><div class='ctx'> </div><div class='ctx'> #define local static            /* for local function definitions */</div><div class='del'>-#define NIL ((unsigned char *)0)        /* for no output option */</div><div class='ctx'> </div><div class='ctx'> /*</div><div class='ctx'>  * Maximums for allocations and loops.  It is not useful to change these --</div><div class='hunk'>@@ -95,7 +101,7 @@ struct state {</div><div class='ctx'>     unsigned long outcnt;       /* bytes written to out so far */</div><div class='ctx'> </div><div class='ctx'>     /* input state */</div><div class='del'>-    unsigned char *in;          /* input buffer */</div><div class='add'>+    const unsigned char *in;    /* input buffer */</div><div class='ctx'>     unsigned long inlen;        /* available input at in */</div><div class='ctx'>     unsigned long incnt;        /* bytes read so far */</div><div class='ctx'>     int bitbuf;                 /* bit buffer */</div><div class='hunk'>@@ -123,7 +129,8 @@ local int bits(struct state *s, int need)</div><div class='ctx'>     /* load at least need bits into val */</div><div class='ctx'>     val = s-&gt;bitbuf;</div><div class='ctx'>     while (s-&gt;bitcnt &lt; need) {</div><div class='del'>-        if (s-&gt;incnt == s-&gt;inlen) longjmp(s-&gt;env, 1);   /* out of input */</div><div class='add'>+        if (s-&gt;incnt == s-&gt;inlen)</div><div class='add'>+            longjmp(s-&gt;env, 1);         /* out of input */</div><div class='ctx'>         val |= (long)(s-&gt;in[s-&gt;incnt++]) &lt;&lt; s-&gt;bitcnt;  /* load eight bits */</div><div class='ctx'>         s-&gt;bitcnt += 8;</div><div class='ctx'>     }</div><div class='hunk'>@@ -162,7 +169,8 @@ local int stored(struct state *s)</div><div class='ctx'>     s-&gt;bitcnt = 0;</div><div class='ctx'> </div><div class='ctx'>     /* get length and check against its one's complement */</div><div class='del'>-    if (s-&gt;incnt + 4 &gt; s-&gt;inlen) return 2;      /* not enough input */</div><div class='add'>+    if (s-&gt;incnt + 4 &gt; s-&gt;inlen)</div><div class='add'>+        return 2;                               /* not enough input */</div><div class='ctx'>     len = s-&gt;in[s-&gt;incnt++];</div><div class='ctx'>     len |= s-&gt;in[s-&gt;incnt++] &lt;&lt; 8;</div><div class='ctx'>     if (s-&gt;in[s-&gt;incnt++] != (~len &amp; 0xff) ||</div><div class='hunk'>@@ -170,7 +178,8 @@ local int stored(struct state *s)</div><div class='ctx'>         return -2;                              /* didn't match complement! */</div><div class='ctx'> </div><div class='ctx'>     /* copy len bytes from in to out */</div><div class='del'>-    if (s-&gt;incnt + len &gt; s-&gt;inlen) return 2;    /* not enough input */</div><div class='add'>+    if (s-&gt;incnt + len &gt; s-&gt;inlen)</div><div class='add'>+        return 2;                               /* not enough input */</div><div class='ctx'>     if (s-&gt;out != NIL) {</div><div class='ctx'>         if (s-&gt;outcnt + len &gt; s-&gt;outlen)</div><div class='ctx'>             return 1;                           /* not enough output space */</div><div class='hunk'>@@ -222,7 +231,7 @@ struct huffman {</div><div class='ctx'>  *   in the deflate format.  See the format notes for fixed() and dynamic().</div><div class='ctx'>  */</div><div class='ctx'> #ifdef SLOW</div><div class='del'>-local int decode(struct state *s, struct huffman *h)</div><div class='add'>+local int decode(struct state *s, const struct huffman *h)</div><div class='ctx'> {</div><div class='ctx'>     int len;            /* current number of bits in code */</div><div class='ctx'>     int code;           /* len bits being decoded */</div><div class='hunk'>@@ -250,7 +259,7 @@ local int decode(struct state *s, struct huffman *h)</div><div class='ctx'>  * a few percent larger.</div><div class='ctx'>  */</div><div class='ctx'> #else /* !SLOW */</div><div class='del'>-local int decode(struct state *s, struct huffman *h)</div><div class='add'>+local int decode(struct state *s, const struct huffman *h)</div><div class='ctx'> {</div><div class='ctx'>     int len;            /* current number of bits in code */</div><div class='ctx'>     int code;           /* len bits being decoded */</div><div class='hunk'>@@ -283,10 +292,13 @@ local int decode(struct state *s, struct huffman *h)</div><div class='ctx'>             len++;</div><div class='ctx'>         }</div><div class='ctx'>         left = (MAXBITS+1) - len;</div><div class='del'>-        if (left == 0) break;</div><div class='del'>-        if (s-&gt;incnt == s-&gt;inlen) longjmp(s-&gt;env, 1);   /* out of input */</div><div class='add'>+        if (left == 0)</div><div class='add'>+            break;</div><div class='add'>+        if (s-&gt;incnt == s-&gt;inlen)</div><div class='add'>+            longjmp(s-&gt;env, 1);         /* out of input */</div><div class='ctx'>         bitbuf = s-&gt;in[s-&gt;incnt++];</div><div class='del'>-        if (left &gt; 8) left = 8;</div><div class='add'>+        if (left &gt; 8)</div><div class='add'>+            left = 8;</div><div class='ctx'>     }</div><div class='ctx'>     return -10;                         /* ran out of codes */</div><div class='ctx'> }</div><div class='hunk'>@@ -324,7 +336,7 @@ local int decode(struct state *s, struct huffman *h)</div><div class='ctx'>  * - Within a given code length, the symbols are kept in ascending order for</div><div class='ctx'>  *   the code bits definition.</div><div class='ctx'>  */</div><div class='del'>-local int construct(struct huffman *h, short *length, int n)</div><div class='add'>+local int construct(struct huffman *h, const short *length, int n)</div><div class='ctx'> {</div><div class='ctx'>     int symbol;         /* current symbol when stepping through length[] */</div><div class='ctx'>     int len;            /* current length when stepping through h-&gt;count[] */</div><div class='hunk'>@@ -344,7 +356,8 @@ local int construct(struct huffman *h, short *length, int n)</div><div class='ctx'>     for (len = 1; len &lt;= MAXBITS; len++) {</div><div class='ctx'>         left &lt;&lt;= 1;                     /* one more bit, double codes left */</div><div class='ctx'>         left -= h-&gt;count[len];          /* deduct count from possible codes */</div><div class='del'>-        if (left &lt; 0) return left;      /* over-subscribed--return negative */</div><div class='add'>+        if (left &lt; 0)</div><div class='add'>+            return left;                /* over-subscribed--return negative */</div><div class='ctx'>     }                                   /* left &gt; 0 means incomplete */</div><div class='ctx'> </div><div class='ctx'>     /* generate offsets into symbol table for each length for sorting */</div><div class='hunk'>@@ -420,8 +433,8 @@ local int construct(struct huffman *h, short *length, int n)</div><div class='ctx'>  *   defined to do the wrong thing in this case.</div><div class='ctx'>  */</div><div class='ctx'> local int codes(struct state *s,</div><div class='del'>-                struct huffman *lencode,</div><div class='del'>-                struct huffman *distcode)</div><div class='add'>+                const struct huffman *lencode,</div><div class='add'>+                const struct huffman *distcode)</div><div class='ctx'> {</div><div class='ctx'>     int symbol;         /* decoded symbol */</div><div class='ctx'>     int len;            /* length for copy */</div><div class='hunk'>@@ -444,11 +457,13 @@ local int codes(struct state *s,</div><div class='ctx'>     /* decode literals and length/distance pairs */</div><div class='ctx'>     do {</div><div class='ctx'>         symbol = decode(s, lencode);</div><div class='del'>-        if (symbol &lt; 0) return symbol;  /* invalid symbol */</div><div class='add'>+        if (symbol &lt; 0)</div><div class='add'>+            return symbol;              /* invalid symbol */</div><div class='ctx'>         if (symbol &lt; 256) {             /* literal: symbol is the byte */</div><div class='ctx'>             /* write out the literal */</div><div class='ctx'>             if (s-&gt;out != NIL) {</div><div class='del'>-                if (s-&gt;outcnt == s-&gt;outlen) return 1;</div><div class='add'>+                if (s-&gt;outcnt == s-&gt;outlen)</div><div class='add'>+                    return 1;</div><div class='ctx'>                 s-&gt;out[s-&gt;outcnt] = symbol;</div><div class='ctx'>             }</div><div class='ctx'>             s-&gt;outcnt++;</div><div class='hunk'>@@ -456,12 +471,14 @@ local int codes(struct state *s,</div><div class='ctx'>         else if (symbol &gt; 256) {        /* length */</div><div class='ctx'>             /* get and compute length */</div><div class='ctx'>             symbol -= 257;</div><div class='del'>-            if (symbol &gt;= 29) return -10;       /* invalid fixed code */</div><div class='add'>+            if (symbol &gt;= 29)</div><div class='add'>+                return -10;             /* invalid fixed code */</div><div class='ctx'>             len = lens[symbol] + bits(s, lext[symbol]);</div><div class='ctx'> </div><div class='ctx'>             /* get and check distance */</div><div class='ctx'>             symbol = decode(s, distcode);</div><div class='del'>-            if (symbol &lt; 0) return symbol;      /* invalid symbol */</div><div class='add'>+            if (symbol &lt; 0)</div><div class='add'>+                return symbol;          /* invalid symbol */</div><div class='ctx'>             dist = dists[symbol] + bits(s, dext[symbol]);</div><div class='ctx'> #ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR</div><div class='ctx'>             if (dist &gt; s-&gt;outcnt)</div><div class='hunk'>@@ -470,13 +487,15 @@ local int codes(struct state *s,</div><div class='ctx'> </div><div class='ctx'>             /* copy length bytes from distance bytes back */</div><div class='ctx'>             if (s-&gt;out != NIL) {</div><div class='del'>-                if (s-&gt;outcnt + len &gt; s-&gt;outlen) return 1;</div><div class='add'>+                if (s-&gt;outcnt + len &gt; s-&gt;outlen)</div><div class='add'>+                    return 1;</div><div class='ctx'>                 while (len--) {</div><div class='ctx'>                     s-&gt;out[s-&gt;outcnt] =</div><div class='ctx'> #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR</div><div class='del'>-                        dist &gt; s-&gt;outcnt ? 0 :</div><div class='add'>+                        dist &gt; s-&gt;outcnt ?</div><div class='add'>+                            0 :</div><div class='ctx'> #endif</div><div class='del'>-                        s-&gt;out[s-&gt;outcnt - dist];</div><div class='add'>+                            s-&gt;out[s-&gt;outcnt - dist];</div><div class='ctx'>                     s-&gt;outcnt++;</div><div class='ctx'>                 }</div><div class='ctx'>             }</div><div class='hunk'>@@ -525,6 +544,12 @@ local int fixed(struct state *s)</div><div class='ctx'>         int symbol;</div><div class='ctx'>         short lengths[FIXLCODES];</div><div class='ctx'> </div><div class='add'>+        /* construct lencode and distcode */</div><div class='add'>+        lencode.count = lencnt;</div><div class='add'>+        lencode.symbol = lensym;</div><div class='add'>+        distcode.count = distcnt;</div><div class='add'>+        distcode.symbol = distsym;</div><div class='add'>+</div><div class='ctx'>         /* literal/length table */</div><div class='ctx'>         for (symbol = 0; symbol &lt; 144; symbol++)</div><div class='ctx'>             lengths[symbol] = 8;</div><div class='hunk'>@@ -541,12 +566,6 @@ local int fixed(struct state *s)</div><div class='ctx'>             lengths[symbol] = 5;</div><div class='ctx'>         construct(&amp;distcode, lengths, MAXDCODES);</div><div class='ctx'> </div><div class='del'>-        /* construct lencode and distcode */</div><div class='del'>-        lencode.count = lencnt;</div><div class='del'>-        lencode.symbol = lensym;</div><div class='del'>-        distcode.count = distcnt;</div><div class='del'>-        distcode.symbol = distsym;</div><div class='del'>-</div><div class='ctx'>         /* do this just once */</div><div class='ctx'>         virgin = 0;</div><div class='ctx'>     }</div><div class='hunk'>@@ -675,7 +694,8 @@ local int dynamic(struct state *s)</div><div class='ctx'> </div><div class='ctx'>     /* build huffman table for code lengths codes (use lencode temporarily) */</div><div class='ctx'>     err = construct(&amp;lencode, lengths, 19);</div><div class='del'>-    if (err != 0) return -4;            /* require complete code set here */</div><div class='add'>+    if (err != 0)               /* require complete code set here */</div><div class='add'>+        return -4;</div><div class='ctx'> </div><div class='ctx'>     /* read length/literal and distance code length tables */</div><div class='ctx'>     index = 0;</div><div class='hunk'>@@ -689,7 +709,8 @@ local int dynamic(struct state *s)</div><div class='ctx'>         else {                          /* repeat instruction */</div><div class='ctx'>             len = 0;                    /* assume repeating zeros */</div><div class='ctx'>             if (symbol == 16) {         /* repeat last length 3..6 times */</div><div class='del'>-                if (index == 0) return -5;      /* no last length! */</div><div class='add'>+                if (index == 0)</div><div class='add'>+                    return -5;          /* no last length! */</div><div class='ctx'>                 len = lengths[index - 1];       /* last length */</div><div class='ctx'>                 symbol = 3 + bits(s, 2);</div><div class='ctx'>             }</div><div class='hunk'>@@ -710,13 +731,13 @@ local int dynamic(struct state *s)</div><div class='ctx'> </div><div class='ctx'>     /* build huffman table for literal/length codes */</div><div class='ctx'>     err = construct(&amp;lencode, lengths, nlen);</div><div class='del'>-    if (err &lt; 0 || (err &gt; 0 &amp;&amp; nlen - lencode.count[0] != 1))</div><div class='del'>-        return -7;      /* only allow incomplete codes if just one code */</div><div class='add'>+    if (err &amp;&amp; (err &lt; 0 || nlen != lencode.count[0] + lencode.count[1]))</div><div class='add'>+        return -7;      /* incomplete code ok only for single length 1 code */</div><div class='ctx'> </div><div class='ctx'>     /* build huffman table for distance codes */</div><div class='ctx'>     err = construct(&amp;distcode, lengths + nlen, ndist);</div><div class='del'>-    if (err &lt; 0 || (err &gt; 0 &amp;&amp; ndist - distcode.count[0] != 1))</div><div class='del'>-        return -8;      /* only allow incomplete codes if just one code */</div><div class='add'>+    if (err &amp;&amp; (err &lt; 0 || ndist != distcode.count[0] + distcode.count[1]))</div><div class='add'>+        return -8;      /* incomplete code ok only for single length 1 code */</div><div class='ctx'> </div><div class='ctx'>     /* decode data until end-of-block code */</div><div class='ctx'>     return codes(s, &amp;lencode, &amp;distcode);</div><div class='hunk'>@@ -768,7 +789,7 @@ local int dynamic(struct state *s)</div><div class='ctx'>  */</div><div class='ctx'> int puff(unsigned char *dest,           /* pointer to destination pointer */</div><div class='ctx'>          unsigned long *destlen,        /* amount of output space */</div><div class='del'>-         unsigned char *source,         /* pointer to source data pointer */</div><div class='add'>+         const unsigned char *source,   /* pointer to source data pointer */</div><div class='ctx'>          unsigned long *sourcelen)      /* amount of input available */</div><div class='ctx'> {</div><div class='ctx'>     struct state s;             /* input/output state */</div><div class='hunk'>@@ -795,11 +816,15 @@ int puff(unsigned char *dest,           /* pointer to destination pointer */</div><div class='ctx'>         do {</div><div class='ctx'>             last = bits(&amp;s, 1);         /* one if last block */</div><div class='ctx'>             type = bits(&amp;s, 2);         /* block type 0..3 */</div><div class='del'>-            err = type == 0 ? stored(&amp;s) :</div><div class='del'>-                  (type == 1 ? fixed(&amp;s) :</div><div class='del'>-                   (type == 2 ? dynamic(&amp;s) :</div><div class='del'>-                    -1));               /* type == 3, invalid */</div><div class='del'>-            if (err != 0) break;        /* return with error */</div><div class='add'>+            err = type == 0 ?</div><div class='add'>+                    stored(&amp;s) :</div><div class='add'>+                    (type == 1 ?</div><div class='add'>+                        fixed(&amp;s) :</div><div class='add'>+                        (type == 2 ?</div><div class='add'>+                            dynamic(&amp;s) :</div><div class='add'>+                            -1));       /* type == 3, invalid */</div><div class='add'>+            if (err != 0)</div><div class='add'>+                break;                  /* return with error */</div><div class='ctx'>         } while (!last);</div><div class='ctx'>     }</div><div class='ctx'> </div><div class='hunk'>@@ -810,146 +835,3 @@ int puff(unsigned char *dest,           /* pointer to destination pointer */</div><div class='ctx'>     }</div><div class='ctx'>     return err;</div><div class='ctx'> }</div><div class='del'>-</div><div class='del'>-#ifdef TEST</div><div class='del'>-/* Examples of how to use puff().</div><div class='del'>-</div><div class='del'>-   Usage: puff [-w] [-nnn] file</div><div class='del'>-          ... | puff [-w] [-nnn]</div><div class='del'>-</div><div class='del'>-   where file is the input file with deflate data, nnn is the number of bytes</div><div class='del'>-   of input to skip before inflating (e.g. to skip a zlib or gzip header), and</div><div class='del'>-   -w is used to write the decompressed data to stdout */</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-</div><div class='del'>-/* Return size times approximately the cube root of 2, keeping the result as 1,</div><div class='del'>-   3, or 5 times a power of 2 -- the result is always &gt; size, until the result</div><div class='del'>-   is the maximum value of an unsigned long, where it remains.  This is useful</div><div class='del'>-   to keep reallocations less than ~33% over the actual data. */</div><div class='del'>-local size_t bythirds(size_t size)</div><div class='del'>-{</div><div class='del'>-    int n;</div><div class='del'>-    size_t m;</div><div class='del'>-</div><div class='del'>-    m = size;</div><div class='del'>-    for (n = 0; m; n++)</div><div class='del'>-        m &gt;&gt;= 1;</div><div class='del'>-    if (n &lt; 3)</div><div class='del'>-        return size + 1;</div><div class='del'>-    n -= 3;</div><div class='del'>-    m = size &gt;&gt; n;</div><div class='del'>-    m += m == 6 ? 2 : 1;</div><div class='del'>-    m &lt;&lt;= n;</div><div class='del'>-    return m &gt; size ? m : (size_t)(-1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read the input file *name, or stdin if name is NULL, into allocated memory.</div><div class='del'>-   Reallocate to larger buffers until the entire file is read in.  Return a</div><div class='del'>-   pointer to the allocated data, or NULL if there was a memory allocation</div><div class='del'>-   failure.  *len is the number of bytes of data read from the input file (even</div><div class='del'>-   if load() returns NULL).  If the input file was empty or could not be opened</div><div class='del'>-   or read, *len is zero. */</div><div class='del'>-local void *load(char *name, size_t *len)</div><div class='del'>-{</div><div class='del'>-    size_t size;</div><div class='del'>-    void *buf, *swap;</div><div class='del'>-    FILE *in;</div><div class='del'>-</div><div class='del'>-    *len = 0;</div><div class='del'>-    buf = malloc(size = 4096);</div><div class='del'>-    if (buf == NULL)</div><div class='del'>-        return NULL;</div><div class='del'>-    in = name == NULL ? stdin : fopen(name, "rb");</div><div class='del'>-    if (in != NULL) {</div><div class='del'>-        for (;;) {</div><div class='del'>-            *len += fread((char *)buf + *len, 1, size - *len, in);</div><div class='del'>-            if (*len &lt; size) break;</div><div class='del'>-            size = bythirds(size);</div><div class='del'>-            if (size == *len || (swap = realloc(buf, size)) == NULL) {</div><div class='del'>-                free(buf);</div><div class='del'>-                buf = NULL;</div><div class='del'>-                break;</div><div class='del'>-            }</div><div class='del'>-            buf = swap;</div><div class='del'>-        }</div><div class='del'>-        fclose(in);</div><div class='del'>-    }</div><div class='del'>-    return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-    int ret, put = 0;</div><div class='del'>-    unsigned skip = 0;</div><div class='del'>-    char *arg, *name = NULL;</div><div class='del'>-    unsigned char *source = NULL, *dest;</div><div class='del'>-    size_t len = 0;</div><div class='del'>-    unsigned long sourcelen, destlen;</div><div class='del'>-</div><div class='del'>-    /* process arguments */</div><div class='del'>-    while (arg = *++argv, --argc)</div><div class='del'>-        if (arg[0] == '-') {</div><div class='del'>-            if (arg[1] == 'w' &amp;&amp; arg[2] == 0)</div><div class='del'>-                put = 1;</div><div class='del'>-            else if (arg[1] &gt;= '0' &amp;&amp; arg[1] &lt;= '9')</div><div class='del'>-                skip = (unsigned)atoi(arg + 1);</div><div class='del'>-            else {</div><div class='del'>-                fprintf(stderr, "invalid option %s\n", arg);</div><div class='del'>-                return 3;</div><div class='del'>-            }</div><div class='del'>-        }</div><div class='del'>-        else if (name != NULL) {</div><div class='del'>-            fprintf(stderr, "only one file name allowed\n");</div><div class='del'>-            return 3;</div><div class='del'>-        }</div><div class='del'>-        else</div><div class='del'>-            name = arg;</div><div class='del'>-    source = load(name, &amp;len);</div><div class='del'>-    if (source == NULL) {</div><div class='del'>-        fprintf(stderr, "memory allocation failure\n");</div><div class='del'>-        return 4;</div><div class='del'>-    }</div><div class='del'>-    if (len == 0) {</div><div class='del'>-        fprintf(stderr, "could not read %s, or it was empty\n",</div><div class='del'>-                name == NULL ? "&lt;stdin&gt;" : name);</div><div class='del'>-        free(source);</div><div class='del'>-        return 3;</div><div class='del'>-    }</div><div class='del'>-    if (skip &gt;= len) {</div><div class='del'>-        fprintf(stderr, "skip request of %d leaves no input\n", skip);</div><div class='del'>-        free(source);</div><div class='del'>-        return 3;</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* test inflate data with offset skip */</div><div class='del'>-    len -= skip;</div><div class='del'>-    sourcelen = (unsigned long)len;</div><div class='del'>-    ret = puff(NIL, &amp;destlen, source + skip, &amp;sourcelen);</div><div class='del'>-    if (ret)</div><div class='del'>-        fprintf(stderr, "puff() failed with return code %d\n", ret);</div><div class='del'>-    else {</div><div class='del'>-        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);</div><div class='del'>-        if (sourcelen &lt; len) fprintf(stderr, "%lu compressed bytes unused\n",</div><div class='del'>-                                     len - sourcelen);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* if requested, inflate again and write decompressd data to stdout */</div><div class='del'>-    if (put) {</div><div class='del'>-        dest = malloc(destlen);</div><div class='del'>-        if (dest == NULL) {</div><div class='del'>-            fprintf(stderr, "memory allocation failure\n");</div><div class='del'>-            free(source);</div><div class='del'>-            return 4;</div><div class='del'>-        }</div><div class='del'>-        puff(dest, &amp;destlen, source + skip, &amp;sourcelen);</div><div class='del'>-        fwrite(dest, 1, destlen, stdout);</div><div class='del'>-        free(dest);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-    /* clean up */</div><div class='del'>-    free(source);</div><div class='del'>-    return ret;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/compat/zlib/contrib/puff/puff.h b/compat/zlib/contrib/puff/puff.h<br/>index 88d1b38..6a0080a 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/puff.h?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/puff/puff.h</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/puff.h?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/puff.h</a></div><div class='hunk'>@@ -1,6 +1,6 @@</div><div class='ctx'> /* puff.h</div><div class='ctx'>   Copyright (C) 2002-2010 Mark Adler, all rights reserved</div><div class='del'>-  version 2.1, 4 Apr 2010</div><div class='add'>+  version 2.2, 25 Apr 2010</div><div class='ctx'> </div><div class='ctx'>   This software is provided 'as-is', without any express or implied</div><div class='ctx'>   warranty.  In no event will the author be held liable for any damages</div><div class='hunk'>@@ -25,7 +25,11 @@</div><div class='ctx'> /*</div><div class='ctx'>  * See puff.c for purpose and usage.</div><div class='ctx'>  */</div><div class='add'>+#ifndef NIL</div><div class='add'>+#  define NIL ((unsigned char *)0)      /* for no output option */</div><div class='add'>+#endif</div><div class='add'>+</div><div class='ctx'> int puff(unsigned char *dest,           /* pointer to destination pointer */</div><div class='ctx'>          unsigned long *destlen,        /* amount of output space */</div><div class='del'>-         unsigned char *source,         /* pointer to source data pointer */</div><div class='add'>+         const unsigned char *source,   /* pointer to source data pointer */</div><div class='ctx'>          unsigned long *sourcelen);     /* amount of input available */</div><div class='head'>diff --git a/compat/zlib/contrib/puff/pufftest.c b/compat/zlib/contrib/puff/pufftest.c<br/>new file mode 100644<br/>index 0000000..76e35f6<br/>--- /dev/null<br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/pufftest.c?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/pufftest.c</a></div><div class='hunk'>@@ -0,0 +1,165 @@</div><div class='add'>+/*</div><div class='add'>+ * pufftest.c</div><div class='add'>+ * Copyright (C) 2002-2010 Mark Adler</div><div class='add'>+ * For conditions of distribution and use, see copyright notice in puff.h</div><div class='add'>+ * version 2.2, 25 Apr 2010</div><div class='add'>+ */</div><div class='add'>+</div><div class='add'>+/* Example of how to use puff().</div><div class='add'>+</div><div class='add'>+   Usage: puff [-w] [-f] [-nnn] file</div><div class='add'>+          ... | puff [-w] [-f] [-nnn]</div><div class='add'>+</div><div class='add'>+   where file is the input file with deflate data, nnn is the number of bytes</div><div class='add'>+   of input to skip before inflating (e.g. to skip a zlib or gzip header), and</div><div class='add'>+   -w is used to write the decompressed data to stdout.  -f is for coverage</div><div class='add'>+   testing, and causes pufftest to fail with not enough output space (-f does</div><div class='add'>+   a write like -w, so -w is not required). */</div><div class='add'>+</div><div class='add'>+#include &lt;stdio.h&gt;</div><div class='add'>+#include &lt;stdlib.h&gt;</div><div class='add'>+#include "puff.h"</div><div class='add'>+</div><div class='add'>+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)</div><div class='add'>+#  include &lt;fcntl.h&gt;</div><div class='add'>+#  include &lt;io.h&gt;</div><div class='add'>+#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)</div><div class='add'>+#else</div><div class='add'>+#  define SET_BINARY_MODE(file)</div><div class='add'>+#endif</div><div class='add'>+</div><div class='add'>+#define local static</div><div class='add'>+</div><div class='add'>+/* Return size times approximately the cube root of 2, keeping the result as 1,</div><div class='add'>+   3, or 5 times a power of 2 -- the result is always &gt; size, until the result</div><div class='add'>+   is the maximum value of an unsigned long, where it remains.  This is useful</div><div class='add'>+   to keep reallocations less than ~33% over the actual data. */</div><div class='add'>+local size_t bythirds(size_t size)</div><div class='add'>+{</div><div class='add'>+    int n;</div><div class='add'>+    size_t m;</div><div class='add'>+</div><div class='add'>+    m = size;</div><div class='add'>+    for (n = 0; m; n++)</div><div class='add'>+        m &gt;&gt;= 1;</div><div class='add'>+    if (n &lt; 3)</div><div class='add'>+        return size + 1;</div><div class='add'>+    n -= 3;</div><div class='add'>+    m = size &gt;&gt; n;</div><div class='add'>+    m += m == 6 ? 2 : 1;</div><div class='add'>+    m &lt;&lt;= n;</div><div class='add'>+    return m &gt; size ? m : (size_t)(-1);</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+/* Read the input file *name, or stdin if name is NULL, into allocated memory.</div><div class='add'>+   Reallocate to larger buffers until the entire file is read in.  Return a</div><div class='add'>+   pointer to the allocated data, or NULL if there was a memory allocation</div><div class='add'>+   failure.  *len is the number of bytes of data read from the input file (even</div><div class='add'>+   if load() returns NULL).  If the input file was empty or could not be opened</div><div class='add'>+   or read, *len is zero. */</div><div class='add'>+local void *load(const char *name, size_t *len)</div><div class='add'>+{</div><div class='add'>+    size_t size;</div><div class='add'>+    void *buf, *swap;</div><div class='add'>+    FILE *in;</div><div class='add'>+</div><div class='add'>+    *len = 0;</div><div class='add'>+    buf = malloc(size = 4096);</div><div class='add'>+    if (buf == NULL)</div><div class='add'>+        return NULL;</div><div class='add'>+    in = name == NULL ? stdin : fopen(name, "rb");</div><div class='add'>+    if (in != NULL) {</div><div class='add'>+        for (;;) {</div><div class='add'>+            *len += fread((char *)buf + *len, 1, size - *len, in);</div><div class='add'>+            if (*len &lt; size) break;</div><div class='add'>+            size = bythirds(size);</div><div class='add'>+            if (size == *len || (swap = realloc(buf, size)) == NULL) {</div><div class='add'>+                free(buf);</div><div class='add'>+                buf = NULL;</div><div class='add'>+                break;</div><div class='add'>+            }</div><div class='add'>+            buf = swap;</div><div class='add'>+        }</div><div class='add'>+        fclose(in);</div><div class='add'>+    }</div><div class='add'>+    return buf;</div><div class='add'>+}</div><div class='add'>+</div><div class='add'>+int main(int argc, char **argv)</div><div class='add'>+{</div><div class='add'>+    int ret, put = 0, fail = 0;</div><div class='add'>+    unsigned skip = 0;</div><div class='add'>+    char *arg, *name = NULL;</div><div class='add'>+    unsigned char *source = NULL, *dest;</div><div class='add'>+    size_t len = 0;</div><div class='add'>+    unsigned long sourcelen, destlen;</div><div class='add'>+</div><div class='add'>+    /* process arguments */</div><div class='add'>+    while (arg = *++argv, --argc)</div><div class='add'>+        if (arg[0] == '-') {</div><div class='add'>+            if (arg[1] == 'w' &amp;&amp; arg[2] == 0)</div><div class='add'>+                put = 1;</div><div class='add'>+            else if (arg[1] == 'f' &amp;&amp; arg[2] == 0)</div><div class='add'>+                fail = 1, put = 1;</div><div class='add'>+            else if (arg[1] &gt;= '0' &amp;&amp; arg[1] &lt;= '9')</div><div class='add'>+                skip = (unsigned)atoi(arg + 1);</div><div class='add'>+            else {</div><div class='add'>+                fprintf(stderr, "invalid option %s\n", arg);</div><div class='add'>+                return 3;</div><div class='add'>+            }</div><div class='add'>+        }</div><div class='add'>+        else if (name != NULL) {</div><div class='add'>+            fprintf(stderr, "only one file name allowed\n");</div><div class='add'>+            return 3;</div><div class='add'>+        }</div><div class='add'>+        else</div><div class='add'>+            name = arg;</div><div class='add'>+    source = load(name, &amp;len);</div><div class='add'>+    if (source == NULL) {</div><div class='add'>+        fprintf(stderr, "memory allocation failure\n");</div><div class='add'>+        return 4;</div><div class='add'>+    }</div><div class='add'>+    if (len == 0) {</div><div class='add'>+        fprintf(stderr, "could not read %s, or it was empty\n",</div><div class='add'>+                name == NULL ? "&lt;stdin&gt;" : name);</div><div class='add'>+        free(source);</div><div class='add'>+        return 3;</div><div class='add'>+    }</div><div class='add'>+    if (skip &gt;= len) {</div><div class='add'>+        fprintf(stderr, "skip request of %d leaves no input\n", skip);</div><div class='add'>+        free(source);</div><div class='add'>+        return 3;</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* test inflate data with offset skip */</div><div class='add'>+    len -= skip;</div><div class='add'>+    sourcelen = (unsigned long)len;</div><div class='add'>+    ret = puff(NIL, &amp;destlen, source + skip, &amp;sourcelen);</div><div class='add'>+    if (ret)</div><div class='add'>+        fprintf(stderr, "puff() failed with return code %d\n", ret);</div><div class='add'>+    else {</div><div class='add'>+        fprintf(stderr, "puff() succeeded uncompressing %lu bytes\n", destlen);</div><div class='add'>+        if (sourcelen &lt; len) fprintf(stderr, "%lu compressed bytes unused\n",</div><div class='add'>+                                     len - sourcelen);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* if requested, inflate again and write decompressd data to stdout */</div><div class='add'>+    if (put &amp;&amp; ret == 0) {</div><div class='add'>+        if (fail)</div><div class='add'>+            destlen &gt;&gt;= 1;</div><div class='add'>+        dest = malloc(destlen);</div><div class='add'>+        if (dest == NULL) {</div><div class='add'>+            fprintf(stderr, "memory allocation failure\n");</div><div class='add'>+            free(source);</div><div class='add'>+            return 4;</div><div class='add'>+        }</div><div class='add'>+        puff(dest, &amp;destlen, source + skip, &amp;sourcelen);</div><div class='add'>+        SET_BINARY_MODE(stdout);</div><div class='add'>+        fwrite(dest, 1, destlen, stdout);</div><div class='add'>+        free(dest);</div><div class='add'>+    }</div><div class='add'>+</div><div class='add'>+    /* clean up */</div><div class='add'>+    free(source);</div><div class='add'>+    return ret;</div><div class='add'>+}</div><div class='head'>diff --git a/compat/zlib/contrib/puff/zeros.raw b/compat/zlib/contrib/puff/zeros.raw<br/>index 637b7be..0a90e76 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/zeros.raw?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/puff/zeros.raw</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/puff/zeros.raw?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/puff/zeros.raw</a></div>Binary files differ<div class='head'>diff --git a/compat/zlib/contrib/vstudio/readme.txt b/compat/zlib/contrib/vstudio/readme.txt<br/>index 904888b..59c8b8b 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/readme.txt?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/readme.txt</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/readme.txt?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/readme.txt</a></div><div class='hunk'>@@ -1,8 +1,8 @@</div><div class='del'>-Building instructions for the DLL versions of Zlib 1.2.4
</div><div class='add'>+Building instructions for the DLL versions of Zlib 1.2.7
</div><div class='ctx'> ========================================================
</div><div class='ctx'> 
</div><div class='ctx'> This directory contains projects that build zlib and minizip using
</div><div class='del'>-Microsoft Visual C++ 9.0/10.0, and Visual C++ .
</div><div class='add'>+Microsoft Visual C++ 9.0/10.0.
</div><div class='ctx'> 
</div><div class='ctx'> You don't need to build these projects yourself. You can download the
</div><div class='ctx'> binaries from:
</div><div class='hunk'>@@ -10,9 +10,6 @@ binaries from:</div><div class='ctx'> 
</div><div class='ctx'> More information can be found at this site.
</div><div class='ctx'> 
</div><div class='del'>-first compile assembly code by running
</div><div class='del'>-bld_ml64.bat in contrib\masmx64
</div><div class='del'>-bld_ml32.bat in contrib\masmx86
</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='hunk'>@@ -20,13 +17,16 @@ bld_ml32.bat in contrib\masmx86</div><div class='ctx'> Build instructions for Visual Studio 2008 (32 bits or 64 bits)
</div><div class='ctx'> --------------------------------------------------------------
</div><div class='ctx'> - Uncompress current zlib, including all contrib/* files
</div><div class='del'>-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0
</div><div class='add'>+- Compile assembly code (with Visual Studio Command Prompt) by running:
</div><div class='add'>+   bld_ml64.bat (in contrib\masmx64)
</div><div class='add'>+   bld_ml32.bat (in contrib\masmx86)
</div><div class='add'>+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
</div><div class='ctx'> - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
</div><div class='ctx'> 
</div><div class='ctx'> Build instructions for Visual Studio 2010 (32 bits or 64 bits)
</div><div class='ctx'> --------------------------------------------------------------
</div><div class='ctx'> - Uncompress current zlib, including all contrib/* files
</div><div class='del'>-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0
</div><div class='add'>+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
</div><div class='ctx'> 
</div><div class='ctx'> 
</div><div class='ctx'> Important
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj b/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj<br/>index 2d62815..bcb08ff 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj</a></div><div class='hunk'>@@ -139,7 +139,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;ProgramDatabaseFile&gt;$(OutDir)testzlib.pdb&lt;/ProgramDatabaseFile&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='hunk'>@@ -169,7 +169,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='ctx'>       &lt;OptimizeReferences&gt;true&lt;/OptimizeReferences&gt;
</div><div class='hunk'>@@ -200,7 +200,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;ProgramDatabaseFile&gt;$(OutDir)testzlib.pdb&lt;/ProgramDatabaseFile&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='hunk'>@@ -227,7 +227,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;ProgramDatabaseFile&gt;$(OutDir)testzlib.pdb&lt;/ProgramDatabaseFile&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='hunk'>@@ -257,7 +257,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='ctx'>       &lt;OptimizeReferences&gt;true&lt;/OptimizeReferences&gt;
</div><div class='hunk'>@@ -288,7 +288,7 @@</div><div class='ctx'>     &lt;/ClCompile&gt;
</div><div class='ctx'>     &lt;Link&gt;
</div><div class='ctx'>       &lt;AdditionalDependencies&gt;ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)&lt;/AdditionalDependencies&gt;
</div><div class='del'>-      &lt;OutputFile&gt;$(OutDir)testzlib.exe&lt;/OutputFile&gt;
</div><div class='add'>+      &lt;OutputFile&gt;$(OutDir)testzlibdll.exe&lt;/OutputFile&gt;
</div><div class='ctx'>       &lt;GenerateDebugInformation&gt;true&lt;/GenerateDebugInformation&gt;
</div><div class='ctx'>       &lt;SubSystem&gt;Console&lt;/SubSystem&gt;
</div><div class='ctx'>       &lt;OptimizeReferences&gt;true&lt;/OptimizeReferences&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc10/zlib.rc b/compat/zlib/contrib/vstudio/vc10/zlib.rc<br/>index f822450..8eca4db 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlib.rc?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc10/zlib.rc</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlib.rc?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlib.rc</a></div><div class='hunk'>@@ -2,8 +2,8 @@</div><div class='ctx'> 
</div><div class='ctx'> #define IDR_VERSION1  1
</div><div class='ctx'> IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
</div><div class='del'>-  FILEVERSION	 1,2,5,0
</div><div class='del'>-  PRODUCTVERSION 1,2,5,0
</div><div class='add'>+  FILEVERSION	 1.2.7,0
</div><div class='add'>+  PRODUCTVERSION 1.2.7,0
</div><div class='ctx'>   FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
</div><div class='ctx'>   FILEFLAGS	0
</div><div class='ctx'>   FILEOS	VOS_DOS_WINDOWS32
</div><div class='hunk'>@@ -17,12 +17,12 @@ BEGIN</div><div class='ctx'> 
</div><div class='ctx'>     BEGIN
</div><div class='ctx'>       VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
</div><div class='del'>-      VALUE "FileVersion",	"1.2.5\0"
</div><div class='add'>+      VALUE "FileVersion",	"1.2.7\0"
</div><div class='ctx'>       VALUE "InternalName",	"zlib\0"
</div><div class='ctx'>       VALUE "OriginalFilename",	"zlib.dll\0"
</div><div class='ctx'>       VALUE "ProductName",	"ZLib.DLL\0"
</div><div class='ctx'>       VALUE "Comments","DLL support by Alessandro Iacopetti &amp; Gilles Vollant\0"
</div><div class='del'>-      VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly &amp; Mark Adler\0"
</div><div class='add'>+      VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly &amp; Mark Adler\0"
</div><div class='ctx'>     END
</div><div class='ctx'>   END
</div><div class='ctx'>   BLOCK "VarFileInfo"
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.def b/compat/zlib/contrib/vstudio/vc10/zlibvc.def<br/>index 0269ef7..18ddf50 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlibvc.def?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc10/zlibvc.def</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlibvc.def?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlibvc.def</a></div><div class='hunk'>@@ -1,7 +1,7 @@</div><div class='ctx'> LIBRARY
</div><div class='ctx'> ; zlib data compression and ZIP file I/O library
</div><div class='ctx'> 
</div><div class='del'>-VERSION		1.24
</div><div class='add'>+VERSION		1.2.7
</div><div class='ctx'> 
</div><div class='ctx'> EXPORTS
</div><div class='ctx'>         adler32                                  @1
</div><div class='hunk'>@@ -55,6 +55,7 @@ EXPORTS</div><div class='ctx'>         gzungetc                                 @49
</div><div class='ctx'>         zlibCompileFlags                         @50
</div><div class='ctx'>         deflatePrime                             @51
</div><div class='add'>+        deflatePending                           @52
</div><div class='ctx'> 
</div><div class='ctx'>         unzOpen                                  @61
</div><div class='ctx'>         unzClose                                 @62
</div><div class='hunk'>@@ -128,3 +129,11 @@ EXPORTS</div><div class='ctx'>         inflatePrime                            @158
</div><div class='ctx'>         inflateReset2                           @159
</div><div class='ctx'>         inflateUndermine                        @160
</div><div class='add'>+
</div><div class='add'>+; zlib1 v1.2.6 added:
</div><div class='add'>+        gzgetc_                                 @161
</div><div class='add'>+        inflateResetKeep                        @163
</div><div class='add'>+        deflateResetKeep                        @164
</div><div class='add'>+</div><div class='add'>+; zlib1 v1.2.7 added:</div><div class='add'>+        gzopen_w                                @165</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj b/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj<br/>index 9862398..9218fdc 100644<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj</a><br/>+++ b/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj?h=bug_d2ffcca163&amp;id=cfc88759ab9d2a7118cb286943fc3074b430804b'>compat/zlib/contrib/vstudio/vc10/zlibvc.vcxproj</a></div><div class='hunk'>@@ -180,6 +180,12 @@</div><div class='ctx'>     &lt;CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'"&gt;AllRules.ruleset&lt;/CodeAnalysisRuleSet&gt;
</div><div class='ctx'>     &lt;CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /&gt;
</div><div class='ctx'>     &lt;CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='add'>+    &lt;TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'"&gt;zlibwapi&lt;/TargetName&gt;
</div><div class='ctx'>   &lt;/PropertyGroup&gt;
</div><div class='ctx'>   &lt;ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"&gt;
</div><div class='ctx'>     &lt;Midl&gt;
</div><div class='hunk'>@@ -227,6 +233,10 @@</div><div class='ctx'>       &lt;/DataExecutionPrevention&gt;
</div><div class='ctx'>       &lt;ImportLibrary&gt;$(OutDir)zlibwapi.lib&lt;/ImportLibrary&gt;
</div><div class='ctx'>     &lt;/Link&gt;
</div><div class='add'>+    &lt;PreBuildEvent&gt;
</div><div class='add'>+      &lt;Command&gt;cd ..\..\masmx86
</div><div class='add'>+bld_ml32.bat&lt;/Command&gt;
</div><div class='add'>+    &lt;/PreBuildEvent&gt;
</div><div class='ctx'>   &lt;/ItemDefinitionGroup&gt;
</div><div class='ctx'>   &lt;ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"&gt;
</div><div class='ctx'>     &lt;Midl&gt;
</div><div class='hunk'>@@ -324,6 +334,10 @@</div><div class='ctx'>       &lt;/DataExecutionPrevention&gt;
</div><div class='ctx'>       &lt;ImportLibrary&gt;$(OutDir)zlibwapi.lib&lt;/ImportLibrary&gt;
</div><div class='ctx'>     &lt;/Link&gt;
</div><div class='add'>+    &lt;PreBuildEvent&gt;
</div><div class='add'>+      &lt;Command&gt;cd ..\..\masmx86
</div><div class='add'>+bld_ml32.bat&lt;/Command&gt;
</div><div class='add'>+    &lt;/PreBuildEvent&gt;
</div><div class='ctx'>   &lt;/ItemDefinitionGroup&gt;
</div><div class='ctx'>   &lt;ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"&gt;
</div><div class='ctx'>     &lt;Midl&gt;
</div><div class='hunk'>@@ -368,6 +382,10 @@</div><div class='ctx'>       &lt;ImportLibrary&gt;$(OutDir)zlibwapi.lib&lt;/ImportLibrary&gt;
</div><div class='ctx'>       &lt;TargetMachine&gt;MachineX64&lt;/TargetMachine&gt;
</div><div class='ctx'>     &lt;/Link&gt;
</div><div class='add'>+    &lt;PreBuildEvent&gt;
</div><div class='add'>+      &lt;Command&gt;cd ..\..\contrib\masmx64
</div><div class='add'>+bld_ml64.bat&lt;/Command&gt;
</div><div class='add'>+    &lt;/PreBuildEvent&gt;
</div><div class='ctx'>   &lt;/ItemDefinitionGroup&gt;
</div><div class='ctx'>   &lt;ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"&gt;
</div><div class='ctx'>     &lt;Midl&gt;
</div><div class='hunk'>@@ -547,6 +565,10 @@</div><div class='ctx'>       &lt;ImportLibrary&gt;$(OutDir)zlibwapi.lib&lt;/ImportLibrary&gt;
</div><div class='ctx'>       &lt;TargetMachine&gt;MachineX64&lt;/TargetMachine&gt;
</div><div class='ctx'>     &lt;/Link&gt;
</div><div class='add'>+    &lt;PreBuildEvent&gt;
</div><div class='add'>+      &lt;Command&gt;cd ..\..\masmx64
</div><div class='add'>+bld_ml64.bat&lt;/Command&gt;
</div><div class='add'>+    &lt;/PreBuildEvent&gt;
</div><div class='ctx'>   &lt;/ItemDefinitionGroup&gt;
</div><div class='ctx'>   &lt;ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"&gt;
</div><div class='ctx'>     &lt;Midl&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/miniunz.vcproj b/compat/zlib/contrib/vstudio/vc7/miniunz.vcproj<br/>deleted file mode 100644<br/>index ad5117c..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/miniunz.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/miniunz.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding = "Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="7.00"
</div><div class='del'>-	Name="miniunz"
</div><div class='del'>-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
</div><div class='del'>-	Keyword="Win32Proj"&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="Debug"
</div><div class='del'>-			IntermediateDirectory="Debug"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="TRUE"
</div><div class='del'>-				BasicRuntimeChecks="3"
</div><div class='del'>-				RuntimeLibrary="5"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="4"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="Release"
</div><div class='del'>-			IntermediateDirectory="Release"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="TRUE"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="3"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\miniunz.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;File
</div><div class='del'>-			RelativePath="ReleaseDll\zlibwapi.lib"&gt;
</div><div class='del'>-		&lt;/File&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/minizip.vcproj b/compat/zlib/contrib/vstudio/vc7/minizip.vcproj<br/>deleted file mode 100644<br/>index fb5b632..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/minizip.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/minizip.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding = "Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="7.00"
</div><div class='del'>-	Name="minizip"
</div><div class='del'>-	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
</div><div class='del'>-	Keyword="Win32Proj"&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="Debug"
</div><div class='del'>-			IntermediateDirectory="Debug"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="TRUE"
</div><div class='del'>-				BasicRuntimeChecks="3"
</div><div class='del'>-				RuntimeLibrary="5"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="4"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="Release"
</div><div class='del'>-			IntermediateDirectory="Release"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="TRUE"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="3"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\minizip.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;File
</div><div class='del'>-			RelativePath="ReleaseDll\zlibwapi.lib"&gt;
</div><div class='del'>-		&lt;/File&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/testzlib.vcproj b/compat/zlib/contrib/vstudio/vc7/testzlib.vcproj<br/>deleted file mode 100644<br/>index 97bc3e8..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/testzlib.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/testzlib.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding = "Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="7.00"
</div><div class='del'>-	Name="testZlibDll"
</div><div class='del'>-	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"
</div><div class='del'>-	Keyword="Win32Proj"&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="Debug"
</div><div class='del'>-			IntermediateDirectory="Debug"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="TRUE"
</div><div class='del'>-				BasicRuntimeChecks="3"
</div><div class='del'>-				RuntimeLibrary="5"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="4"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="Release"
</div><div class='del'>-			IntermediateDirectory="Release"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="TRUE"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="TRUE"
</div><div class='del'>-				DebugInformationFormat="3"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\testzlib\testzlib.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;File
</div><div class='del'>-			RelativePath="ReleaseDll\zlibwapi.lib"&gt;
</div><div class='del'>-		&lt;/File&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/zlib.rc b/compat/zlib/contrib/vstudio/vc7/zlib.rc<br/>deleted file mode 100644<br/>index 72cb8b4..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/zlib.rc?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/zlib.rc</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-#include &lt;windows.h&gt;
</div><div class='del'>-
</div><div class='del'>-#define IDR_VERSION1  1
</div><div class='del'>-IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
</div><div class='del'>-  FILEVERSION	 1,2,3,0
</div><div class='del'>-  PRODUCTVERSION 1,2,3,0
</div><div class='del'>-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
</div><div class='del'>-  FILEFLAGS	0
</div><div class='del'>-  FILEOS	VOS_DOS_WINDOWS32
</div><div class='del'>-  FILETYPE	VFT_DLL
</div><div class='del'>-  FILESUBTYPE	0	// not used
</div><div class='del'>-BEGIN
</div><div class='del'>-  BLOCK "StringFileInfo"
</div><div class='del'>-  BEGIN
</div><div class='del'>-    BLOCK "040904E4"
</div><div class='del'>-    //language ID = U.S. English, char set = Windows, Multilingual
</div><div class='del'>-
</div><div class='del'>-    BEGIN
</div><div class='del'>-      VALUE "FileDescription", "zlib data compression library\0"
</div><div class='del'>-      VALUE "FileVersion",	"1.2.3.0\0"
</div><div class='del'>-      VALUE "InternalName",	"zlib\0"
</div><div class='del'>-      VALUE "OriginalFilename",	"zlib.dll\0"
</div><div class='del'>-      VALUE "ProductName",	"ZLib.DLL\0"
</div><div class='del'>-      VALUE "Comments","DLL support by Alessandro Iacopetti &amp; Gilles Vollant\0"
</div><div class='del'>-      VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly &amp; Mark Adler\0"
</div><div class='del'>-    END
</div><div class='del'>-  END
</div><div class='del'>-  BLOCK "VarFileInfo"
</div><div class='del'>-  BEGIN
</div><div class='del'>-    VALUE "Translation", 0x0409, 1252
</div><div class='del'>-  END
</div><div class='del'>-END
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj b/compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj<br/>deleted file mode 100644<br/>index 766d7a4..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/zlibstat.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,246 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding = "Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="7.00"
</div><div class='del'>-	Name="zlibstat"
</div><div class='del'>-	SccProjectName=""
</div><div class='del'>-	SccLocalPath=""&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibstatDebug"
</div><div class='del'>-			IntermediateDirectory=".\zlibstatDebug"
</div><div class='del'>-			ConfigurationType="4"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="5"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibstatDebug/zlibstat.pch"
</div><div class='del'>-				AssemblerListingLocation=".\zlibstatDebug/"
</div><div class='del'>-				ObjectFile=".\zlibstatDebug/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibstatDebug/"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				DebugInformationFormat="1"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLibrarianTool"
</div><div class='del'>-				AdditionalOptions="/NODEFAULTLIB "
</div><div class='del'>-				OutputFile=".\zlibstatDebug\zlibstat.lib"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseAxp|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibsta0"
</div><div class='del'>-			IntermediateDirectory=".\zlibsta0"
</div><div class='del'>-			ConfigurationType="4"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibsta0/zlibstat.pch"
</div><div class='del'>-				AssemblerListingLocation=".\zlibsta0/"
</div><div class='del'>-				ObjectFile=".\zlibsta0/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibsta0/"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLibrarianTool"
</div><div class='del'>-				AdditionalOptions="/NODEFAULTLIB "
</div><div class='del'>-				OutputFile=".\zlibsta0\zlibstat.lib"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibstat"
</div><div class='del'>-			IntermediateDirectory=".\zlibstat"
</div><div class='del'>-			ConfigurationType="4"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibstat/zlibstat.pch"
</div><div class='del'>-				AssemblerListingLocation=".\zlibstat/"
</div><div class='del'>-				ObjectFile=".\zlibstat/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibstat/"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLibrarianTool"
</div><div class='del'>-				AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB "
</div><div class='del'>-				OutputFile=".\zlibstat\zlibstat.lib"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutAsm|Win32"
</div><div class='del'>-			OutputDirectory="zlibstatWithoutAsm"
</div><div class='del'>-			IntermediateDirectory="zlibstatWithoutAsm"
</div><div class='del'>-			ConfigurationType="4"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="4"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibstat/zlibstat.pch"
</div><div class='del'>-				AssemblerListingLocation=".\zlibstatWithoutAsm/"
</div><div class='del'>-				ObjectFile=".\zlibstatWithoutAsm/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibstatWithoutAsm/"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLibrarianTool"
</div><div class='del'>-				AdditionalOptions=" /NODEFAULTLIB "
</div><div class='del'>-				OutputFile=".\zlibstatWithoutAsm\zlibstat.lib"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter=""&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\adler32.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\compress.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\crc32.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\deflate.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\masmx86\gvmat32c.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\gzio.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infback.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inffast.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inflate.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inftrees.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\ioapi.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\trees.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\uncompr.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\unzip.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\zip.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath=".\zlib.rc"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath=".\zlibvc.def"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zutil.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/zlibvc.def b/compat/zlib/contrib/vstudio/vc7/zlibvc.def<br/>deleted file mode 100644<br/>index a40e715..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/zlibvc.def?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/zlibvc.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-
</div><div class='del'>-VERSION		1.23
</div><div class='del'>-
</div><div class='del'>-HEAPSIZE	1048576,8192
</div><div class='del'>-
</div><div class='del'>-EXPORTS
</div><div class='del'>-        adler32                                  @1
</div><div class='del'>-        compress                                 @2
</div><div class='del'>-        crc32                                    @3
</div><div class='del'>-        deflate                                  @4
</div><div class='del'>-        deflateCopy                              @5
</div><div class='del'>-        deflateEnd                               @6
</div><div class='del'>-        deflateInit2_                            @7
</div><div class='del'>-        deflateInit_                             @8
</div><div class='del'>-        deflateParams                            @9
</div><div class='del'>-        deflateReset                             @10
</div><div class='del'>-        deflateSetDictionary                     @11
</div><div class='del'>-        gzclose                                  @12
</div><div class='del'>-        gzdopen                                  @13
</div><div class='del'>-        gzerror                                  @14
</div><div class='del'>-        gzflush                                  @15
</div><div class='del'>-        gzopen                                   @16
</div><div class='del'>-        gzread                                   @17
</div><div class='del'>-        gzwrite                                  @18
</div><div class='del'>-        inflate                                  @19
</div><div class='del'>-        inflateEnd                               @20
</div><div class='del'>-        inflateInit2_                            @21
</div><div class='del'>-        inflateInit_                             @22
</div><div class='del'>-        inflateReset                             @23
</div><div class='del'>-        inflateSetDictionary                     @24
</div><div class='del'>-        inflateSync                              @25
</div><div class='del'>-        uncompress                               @26
</div><div class='del'>-        zlibVersion                              @27
</div><div class='del'>-        gzprintf                                 @28
</div><div class='del'>-        gzputc                                   @29
</div><div class='del'>-        gzgetc                                   @30
</div><div class='del'>-        gzseek                                   @31
</div><div class='del'>-        gzrewind                                 @32
</div><div class='del'>-        gztell                                   @33
</div><div class='del'>-        gzeof                                    @34
</div><div class='del'>-        gzsetparams                              @35
</div><div class='del'>-        zError                                   @36
</div><div class='del'>-        inflateSyncPoint                         @37
</div><div class='del'>-        get_crc_table                            @38
</div><div class='del'>-        compress2                                @39
</div><div class='del'>-        gzputs                                   @40
</div><div class='del'>-        gzgets                                   @41
</div><div class='del'>-        inflateCopy                              @42
</div><div class='del'>-        inflateBackInit_                         @43
</div><div class='del'>-        inflateBack                              @44
</div><div class='del'>-        inflateBackEnd                           @45
</div><div class='del'>-        compressBound                            @46
</div><div class='del'>-        deflateBound                             @47
</div><div class='del'>-        gzclearerr                               @48
</div><div class='del'>-        gzungetc                                 @49
</div><div class='del'>-        zlibCompileFlags                         @50
</div><div class='del'>-        deflatePrime                             @51
</div><div class='del'>-
</div><div class='del'>-        unzOpen                                  @61
</div><div class='del'>-        unzClose                                 @62
</div><div class='del'>-        unzGetGlobalInfo                         @63
</div><div class='del'>-        unzGetCurrentFileInfo                    @64
</div><div class='del'>-        unzGoToFirstFile                         @65
</div><div class='del'>-        unzGoToNextFile                          @66
</div><div class='del'>-        unzOpenCurrentFile                       @67
</div><div class='del'>-        unzReadCurrentFile                       @68
</div><div class='del'>-        unzOpenCurrentFile3                      @69
</div><div class='del'>-        unztell                                  @70
</div><div class='del'>-        unzeof                                   @71
</div><div class='del'>-        unzCloseCurrentFile                      @72
</div><div class='del'>-        unzGetGlobalComment                      @73
</div><div class='del'>-        unzStringFileNameCompare                 @74
</div><div class='del'>-        unzLocateFile                            @75
</div><div class='del'>-        unzGetLocalExtrafield                    @76
</div><div class='del'>-        unzOpen2                                 @77
</div><div class='del'>-        unzOpenCurrentFile2                      @78
</div><div class='del'>-        unzOpenCurrentFilePassword               @79
</div><div class='del'>-
</div><div class='del'>-        zipOpen                                  @80
</div><div class='del'>-        zipOpenNewFileInZip                      @81
</div><div class='del'>-        zipWriteInFileInZip                      @82
</div><div class='del'>-        zipCloseFileInZip                        @83
</div><div class='del'>-        zipClose                                 @84
</div><div class='del'>-        zipOpenNewFileInZip2                     @86
</div><div class='del'>-        zipCloseFileInZipRaw                     @87
</div><div class='del'>-        zipOpen2                                 @88
</div><div class='del'>-        zipOpenNewFileInZip3                     @89
</div><div class='del'>-
</div><div class='del'>-        unzGetFilePos                            @100
</div><div class='del'>-        unzGoToFilePos                           @101
</div><div class='del'>-
</div><div class='del'>-        fill_win32_filefunc                      @110
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/zlibvc.sln b/compat/zlib/contrib/vstudio/vc7/zlibvc.sln<br/>deleted file mode 100644<br/>index 927b42b..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/zlibvc.sln?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/zlibvc.sln</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,78 +0,0 @@</div><div class='del'>-Microsoft Visual Studio Solution File, Format Version 7.00
</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
</div><div class='del'>-EndProject
</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
</div><div class='del'>-EndProject
</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
</div><div class='del'>-EndProject
</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
</div><div class='del'>-EndProject
</div><div class='del'>-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testZlibDll", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}"
</div><div class='del'>-EndProject
</div><div class='del'>-Global
</div><div class='del'>-	GlobalSection(SolutionConfiguration) = preSolution
</div><div class='del'>-		ConfigName.0 = Debug
</div><div class='del'>-		ConfigName.1 = Release
</div><div class='del'>-		ConfigName.2 = ReleaseAxp
</div><div class='del'>-		ConfigName.3 = ReleaseWithoutAsm
</div><div class='del'>-		ConfigName.4 = ReleaseWithoutCrtdll
</div><div class='del'>-	EndGlobalSection
</div><div class='del'>-	GlobalSection(ProjectDependencies) = postSolution
</div><div class='del'>-	EndGlobalSection
</div><div class='del'>-	GlobalSection(ProjectConfiguration) = postSolution
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.ActiveCfg = Debug|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.Build.0 = Debug|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.ActiveCfg = Release|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.Build.0 = Release|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.Build.0 = ReleaseAxp|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseAxp|Win32
</div><div class='del'>-		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.Build.0 = ReleaseAxp|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.ActiveCfg = Debug|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.Build.0 = Debug|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.ActiveCfg = Release|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.Build.0 = Release|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.Build.0 = ReleaseAxp|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseWithoutCrtdll|Win32
</div><div class='del'>-		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.Build.0 = ReleaseWithoutCrtdll|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.ActiveCfg = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.Build.0 = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.ActiveCfg = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.Build.0 = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32
</div><div class='del'>-		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.Build.0 = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.ActiveCfg = Debug|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.Build.0 = Debug|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.ActiveCfg = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.Build.0 = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.ActiveCfg = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.Build.0 = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.ActiveCfg = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32
</div><div class='del'>-		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.ActiveCfg = Debug|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.Build.0 = Debug|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.ActiveCfg = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.Build.0 = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.ActiveCfg = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.Build.0 = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.ActiveCfg = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.Build.0 = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32
</div><div class='del'>-		{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.Build.0 = Release|Win32
</div><div class='del'>-	EndGlobalSection
</div><div class='del'>-	GlobalSection(ExtensibilityGlobals) = postSolution
</div><div class='del'>-	EndGlobalSection
</div><div class='del'>-	GlobalSection(ExtensibilityAddIns) = postSolution
</div><div class='del'>-	EndGlobalSection
</div><div class='del'>-EndGlobal
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj b/compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj<br/>deleted file mode 100644<br/>index 8533b49..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc7/zlibvc.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,445 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding = "Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="7.00"
</div><div class='del'>-	Name="zlibvc"
</div><div class='del'>-	SccProjectName=""
</div><div class='del'>-	SccLocalPath=""&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory=".\DebugDll"
</div><div class='del'>-			IntermediateDirectory=".\DebugDll"
</div><div class='del'>-			ConfigurationType="2"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="1"
</div><div class='del'>-				PrecompiledHeaderFile=".\DebugDll/zlibvc.pch"
</div><div class='del'>-				AssemblerListingLocation=".\DebugDll/"
</div><div class='del'>-				ObjectFile=".\DebugDll/"
</div><div class='del'>-				ProgramDataBaseFileName=".\DebugDll/"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				DebugInformationFormat="4"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalOptions="/MACHINE:I386"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
</div><div class='del'>-				OutputFile=".\DebugDll\zlibwapi.dll"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				ModuleDefinitionFile=".\zlibvc.def"
</div><div class='del'>-				GenerateDebugInformation="TRUE"
</div><div class='del'>-				ProgramDatabaseFile=".\DebugDll/zlibwapi.pdb"
</div><div class='del'>-				SubSystem="2"
</div><div class='del'>-				ImportLibrary=".\DebugDll/zlibwapi.lib"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				PreprocessorDefinitions="_DEBUG"
</div><div class='del'>-				MkTypLibCompatible="TRUE"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				TargetEnvironment="1"
</div><div class='del'>-				TypeLibraryName=".\DebugDll/zlibvc.tlb"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				PreprocessorDefinitions="_DEBUG"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutAsm|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibDllWithoutAsm"
</div><div class='del'>-			IntermediateDirectory=".\zlibDllWithoutAsm"
</div><div class='del'>-			ConfigurationType="2"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
</div><div class='del'>-			WholeProgramOptimization="TRUE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32,ZLIB_WINAPI"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibDllWithoutAsm/zlibvc.pch"
</div><div class='del'>-				AssemblerOutput="2"
</div><div class='del'>-				AssemblerListingLocation=".\zlibDllWithoutAsm/"
</div><div class='del'>-				ObjectFile=".\zlibDllWithoutAsm/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibDllWithoutAsm/"
</div><div class='del'>-				BrowseInformation="1"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalOptions="/MACHINE:I386"
</div><div class='del'>-				AdditionalDependencies="crtdll.lib"
</div><div class='del'>-				OutputFile=".\zlibDllWithoutAsm\zlibwapi.dll"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				IgnoreAllDefaultLibraries="TRUE"
</div><div class='del'>-				ModuleDefinitionFile=".\zlibvc.def"
</div><div class='del'>-				ProgramDatabaseFile=".\zlibDllWithoutAsm/zlibwapi.pdb"
</div><div class='del'>-				GenerateMapFile="TRUE"
</div><div class='del'>-				MapFileName=".\zlibDllWithoutAsm/zlibwapi.map"
</div><div class='del'>-				SubSystem="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				ImportLibrary=".\zlibDllWithoutAsm/zlibwapi.lib"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				MkTypLibCompatible="TRUE"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				TargetEnvironment="1"
</div><div class='del'>-				TypeLibraryName=".\zlibDllWithoutAsm/zlibvc.tlb"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutCrtdll|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibDllWithoutCrtDll"
</div><div class='del'>-			IntermediateDirectory=".\zlibDllWithoutCrtDll"
</div><div class='del'>-			ConfigurationType="2"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
</div><div class='del'>-			WholeProgramOptimization="TRUE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibDllWithoutCrtDll/zlibvc.pch"
</div><div class='del'>-				AssemblerOutput="2"
</div><div class='del'>-				AssemblerListingLocation=".\zlibDllWithoutCrtDll/"
</div><div class='del'>-				ObjectFile=".\zlibDllWithoutCrtDll/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibDllWithoutCrtDll/"
</div><div class='del'>-				BrowseInformation="1"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalOptions="/MACHINE:I386"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj "
</div><div class='del'>-				OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				IgnoreAllDefaultLibraries="FALSE"
</div><div class='del'>-				ModuleDefinitionFile=".\zlibvc.def"
</div><div class='del'>-				ProgramDatabaseFile=".\zlibDllWithoutCrtDll/zlibwapi.pdb"
</div><div class='del'>-				GenerateMapFile="TRUE"
</div><div class='del'>-				MapFileName=".\zlibDllWithoutCrtDll/zlibwapi.map"
</div><div class='del'>-				SubSystem="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				ImportLibrary=".\zlibDllWithoutCrtDll/zlibwapi.lib"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				MkTypLibCompatible="TRUE"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				TargetEnvironment="1"
</div><div class='del'>-				TypeLibraryName=".\zlibDllWithoutCrtDll/zlibvc.tlb"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseAxp|Win32"
</div><div class='del'>-			OutputDirectory=".\zlibvc__"
</div><div class='del'>-			IntermediateDirectory=".\zlibvc__"
</div><div class='del'>-			ConfigurationType="2"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
</div><div class='del'>-			WholeProgramOptimization="TRUE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32,ZLIB_WINAPI"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\zlibvc__/zlibvc.pch"
</div><div class='del'>-				AssemblerOutput="2"
</div><div class='del'>-				AssemblerListingLocation=".\zlibvc__/"
</div><div class='del'>-				ObjectFile=".\zlibvc__/"
</div><div class='del'>-				ProgramDataBaseFileName=".\zlibvc__/"
</div><div class='del'>-				BrowseInformation="1"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="crtdll.lib"
</div><div class='del'>-				OutputFile="zlibvc__\zlibwapi.dll"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				IgnoreAllDefaultLibraries="TRUE"
</div><div class='del'>-				ModuleDefinitionFile=".\zlibvc.def"
</div><div class='del'>-				ProgramDatabaseFile=".\zlibvc__/zlibwapi.pdb"
</div><div class='del'>-				GenerateMapFile="TRUE"
</div><div class='del'>-				MapFileName=".\zlibvc__/zlibwapi.map"
</div><div class='del'>-				SubSystem="2"
</div><div class='del'>-				ImportLibrary=".\zlibvc__/zlibwapi.lib"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				MkTypLibCompatible="TRUE"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				TargetEnvironment="1"
</div><div class='del'>-				TypeLibraryName=".\zlibvc__/zlibvc.tlb"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory=".\ReleaseDll"
</div><div class='del'>-			IntermediateDirectory=".\ReleaseDll"
</div><div class='del'>-			ConfigurationType="2"
</div><div class='del'>-			UseOfMFC="0"
</div><div class='del'>-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
</div><div class='del'>-			WholeProgramOptimization="TRUE"&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\masmx86"
</div><div class='del'>-				PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF"
</div><div class='del'>-				StringPooling="TRUE"
</div><div class='del'>-				ExceptionHandling="FALSE"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				EnableFunctionLevelLinking="TRUE"
</div><div class='del'>-				PrecompiledHeaderFile=".\ReleaseDll/zlibvc.pch"
</div><div class='del'>-				AssemblerOutput="2"
</div><div class='del'>-				AssemblerListingLocation=".\ReleaseDll/"
</div><div class='del'>-				ObjectFile=".\ReleaseDll/"
</div><div class='del'>-				ProgramDataBaseFileName=".\ReleaseDll/"
</div><div class='del'>-				BrowseInformation="1"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				SuppressStartupBanner="TRUE"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalOptions="/MACHINE:I386"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj crtdll.lib"
</div><div class='del'>-				OutputFile=".\ReleaseDll\zlibwapi.dll"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				IgnoreAllDefaultLibraries="TRUE"
</div><div class='del'>-				ModuleDefinitionFile=".\zlibvc.def"
</div><div class='del'>-				ProgramDatabaseFile=".\ReleaseDll/zlibwapi.pdb"
</div><div class='del'>-				GenerateMapFile="TRUE"
</div><div class='del'>-				MapFileName=".\ReleaseDll/zlibwapi.map"
</div><div class='del'>-				SubSystem="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				ImportLibrary=".\ReleaseDll/zlibwapi.lib"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				MkTypLibCompatible="TRUE"
</div><div class='del'>-				SuppressStartupBanner="TRUE"
</div><div class='del'>-				TargetEnvironment="1"
</div><div class='del'>-				TypeLibraryName=".\Release/zlibvc.tlb"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-				PreprocessorDefinitions="NDEBUG"
</div><div class='del'>-				Culture="1036"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\adler32.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\compress.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\crc32.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\deflate.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\masmx86\gvmat32c.c"&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseWithoutAsm|Win32"
</div><div class='del'>-					ExcludedFromBuild="TRUE"&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\gzio.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infback.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inffast.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inflate.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inftrees.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\ioapi.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\iowin32.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\trees.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\uncompr.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\unzip.c"&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Win32"&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-						AdditionalIncludeDirectories=""
</div><div class='del'>-						PreprocessorDefinitions="ZLIB_INTERNAL"/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\zip.c"&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Win32"&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-						AdditionalIncludeDirectories=""
</div><div class='del'>-						PreprocessorDefinitions="ZLIB_INTERNAL"/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath=".\zlib.rc"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath=".\zlibvc.def"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zutil.c"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;fi;fd"&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\deflate.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infblock.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infcodes.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inffast.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inftrees.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infutil.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zconf.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zlib.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zutil.h"&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc8/miniunz.vcproj b/compat/zlib/contrib/vstudio/vc8/miniunz.vcproj<br/>deleted file mode 100644<br/>index 4af53e8..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc8/miniunz.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc8/miniunz.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,566 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="8,00"
</div><div class='del'>-	Name="miniunz"
</div><div class='del'>-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
</div><div class='del'>-	Keyword="Win32Proj"
</div><div class='del'>-	&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="x64"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Itanium"
</div><div class='del'>-		/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;ToolFiles&gt;
</div><div class='del'>-	&lt;/ToolFiles&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="1"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="4"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|x64"
</div><div class='del'>-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="17"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/miniunz.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="x86\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|x64"
</div><div class='del'>-			OutputDirectory="x64\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="17"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\MiniUnzip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/miniunz.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;References&gt;
</div><div class='del'>-	&lt;/References&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\miniunz.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc8/minizip.vcproj b/compat/zlib/contrib/vstudio/vc8/minizip.vcproj<br/>deleted file mode 100644<br/>index 85f64c4..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc8/minizip.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc8/minizip.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,563 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="8,00"
</div><div class='del'>-	Name="minizip"
</div><div class='del'>-	ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
</div><div class='del'>-	Keyword="Win32Proj"
</div><div class='del'>-	&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="x64"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Itanium"
</div><div class='del'>-		/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;ToolFiles&gt;
</div><div class='del'>-	&lt;/ToolFiles&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="1"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="4"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|x64"
</div><div class='del'>-			OutputDirectory="x64\$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\$(ConfigurationName)"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="17"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\$(ConfigurationName)"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/minizip.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="x86\MiniZip$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|x64"
</div><div class='del'>-			OutputDirectory="x64\$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\$(ConfigurationName)"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x64\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="17"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\$(ConfigurationName)"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="ia64\ZlibDllRelease\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/minizip.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;References&gt;
</div><div class='del'>-	&lt;/References&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\minizip\minizip.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc8/testzlib.vcproj b/compat/zlib/contrib/vstudio/vc8/testzlib.vcproj<br/>deleted file mode 100644<br/>index 68c3539..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc8/testzlib.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc8/testzlib.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,948 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="8,00"
</div><div class='del'>-	Name="testzlib"
</div><div class='del'>-	ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
</div><div class='del'>-	RootNamespace="testzlib"
</div><div class='del'>-	Keyword="Win32Proj"
</div><div class='del'>-	&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="x64"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Itanium"
</div><div class='del'>-		/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;ToolFiles&gt;
</div><div class='del'>-	&lt;/ToolFiles&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="1"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerOutput="4"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="4"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|x64"
</div><div class='del'>-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerOutput="4"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutAsm|Win32"
</div><div class='del'>-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutAsm|x64"
</div><div class='del'>-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies=""
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="ReleaseWithoutAsm|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="x86\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="0"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|x64"
</div><div class='del'>-			OutputDirectory="x64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\TestZlib$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			WholeProgramOptimization="1"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="2"
</div><div class='del'>-				InlineFunctionExpansion="1"
</div><div class='del'>-				OmitFramePointers="true"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\.."
</div><div class='del'>-				PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64"
</div><div class='del'>-				StringPooling="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="2"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				EnableFunctionLevelLinking="true"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="1"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				OptimizeReferences="2"
</div><div class='del'>-				EnableCOMDATFolding="2"
</div><div class='del'>-				OptimizeForWindows98="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-	&lt;/Configurations&gt;
</div><div class='del'>-	&lt;References&gt;
</div><div class='del'>-	&lt;/References&gt;
</div><div class='del'>-	&lt;Files&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Source Files"
</div><div class='del'>-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\adler32.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\compress.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\crc32.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\deflate.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\masmx86\gvmat32c.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Debug|x64"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Debug|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseWithoutAsm|x64"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseWithoutAsm|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|x64"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Debug|Win64 (AMD64)"
</div><div class='del'>-					ExcludedFromBuild="TRUE"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Win64 (AMD64)"
</div><div class='del'>-					ExcludedFromBuild="TRUE"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseAsm|Win64 (AMD64)"
</div><div class='del'>-					ExcludedFromBuild="TRUE"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\infback.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\masmx64\inffas8664.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Debug|Win32"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Debug|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseWithoutAsm|Win32"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="ReleaseWithoutAsm|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Win32"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-				&lt;FileConfiguration
</div><div class='del'>-					Name="Release|Itanium"
</div><div class='del'>-					ExcludedFromBuild="true"
</div><div class='del'>-					&gt;
</div><div class='del'>-					&lt;Tool
</div><div class='del'>-						Name="VCCLCompilerTool"
</div><div class='del'>-					/&gt;
</div><div class='del'>-				&lt;/FileConfiguration&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inffast.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inflate.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\inftrees.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\testzlib\testzlib.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\trees.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\uncompr.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-			&lt;File
</div><div class='del'>-				RelativePath="..\..\..\zutil.c"
</div><div class='del'>-				&gt;
</div><div class='del'>-			&lt;/File&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Header Files"
</div><div class='del'>-			Filter="h;hpp;hxx;hm;inl;inc"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-		&lt;Filter
</div><div class='del'>-			Name="Resource Files"
</div><div class='del'>-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
</div><div class='del'>-			&gt;
</div><div class='del'>-		&lt;/Filter&gt;
</div><div class='del'>-	&lt;/Files&gt;
</div><div class='del'>-	&lt;Globals&gt;
</div><div class='del'>-	&lt;/Globals&gt;
</div><div class='del'>-&lt;/VisualStudioProject&gt;
</div><div class='head'>diff --git a/compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj b/compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj<br/>deleted file mode 100644<br/>index f38ab5e..0000000<br/>--- a/<a href='/oss-git/tcl.git/tree/compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj?h=bug_d2ffcca163&amp;id=21ffddf58f04c4a455f133435b83bc79da913805'>compat/zlib/contrib/vstudio/vc8/testzlibdll.vcproj</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,567 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0" encoding="Windows-1252"?&gt;
</div><div class='del'>-&lt;VisualStudioProject
</div><div class='del'>-	ProjectType="Visual C++"
</div><div class='del'>-	Version="8,00"
</div><div class='del'>-	Name="TestZlibDll"
</div><div class='del'>-	ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
</div><div class='del'>-	Keyword="Win32Proj"
</div><div class='del'>-	SignManifests="true"
</div><div class='del'>-	&gt;
</div><div class='del'>-	&lt;Platforms&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Win32"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="x64"
</div><div class='del'>-		/&gt;
</div><div class='del'>-		&lt;Platform
</div><div class='del'>-			Name="Itanium"
</div><div class='del'>-		/&gt;
</div><div class='del'>-	&lt;/Platforms&gt;
</div><div class='del'>-	&lt;ToolFiles&gt;
</div><div class='del'>-	&lt;/ToolFiles&gt;
</div><div class='del'>-	&lt;Configurations&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Win32"
</div><div class='del'>-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="1"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="4"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x86\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="1"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|x64"
</div><div class='del'>-			OutputDirectory="x64\TestZlibDll$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="17"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Debug|Itanium"
</div><div class='del'>-			OutputDirectory="ia64\TestZlibDll$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCustomBuildTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXMLDataGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebServiceProxyGeneratorTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCMIDLTool"
</div><div class='del'>-				TargetEnvironment="2"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCCLCompilerTool"
</div><div class='del'>-				Optimization="0"
</div><div class='del'>-				AdditionalIncludeDirectories="..\..\..;..\..\minizip"
</div><div class='del'>-				PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64"
</div><div class='del'>-				MinimalRebuild="true"
</div><div class='del'>-				BasicRuntimeChecks="0"
</div><div class='del'>-				RuntimeLibrary="3"
</div><div class='del'>-				BufferSecurityCheck="false"
</div><div class='del'>-				UsePrecompiledHeader="0"
</div><div class='del'>-				AssemblerListingLocation="$(IntDir)\"
</div><div class='del'>-				WarningLevel="3"
</div><div class='del'>-				Detect64BitPortabilityProblems="true"
</div><div class='del'>-				DebugInformationFormat="3"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManagedResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCResourceCompilerTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPreLinkEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCLinkerTool"
</div><div class='del'>-				AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib"
</div><div class='del'>-				OutputFile="$(OutDir)/testzlib.exe"
</div><div class='del'>-				LinkIncremental="2"
</div><div class='del'>-				GenerateManifest="false"
</div><div class='del'>-				GenerateDebugInformation="true"
</div><div class='del'>-				ProgramDatabaseFile="$(OutDir)/testzlib.pdb"
</div><div class='del'>-				SubSystem="1"
</div><div class='del'>-				TargetMachine="5"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCALinkTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCManifestTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCXDCMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCBscMakeTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCFxCopTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCAppVerifierTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCWebDeploymentTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-			&lt;Tool
</div><div class='del'>-				Name="VCPostBuildEventTool"
</div><div class='del'>-			/&gt;
</div><div class='del'>-		&lt;/Configuration&gt;
</div><div class='del'>-		&lt;Configuration
</div><div class='del'>-			Name="Release|Win32"
</div><div class='del'>-			OutputDirectory="x86\TestZlibDll$(ConfigurationName)"
</div><div class='del'>-			IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp"
</div><div class='del'>-			ConfigurationType="1"
</div><div class='del'>-			InheritedPropertySheets="UpgradeFromVC70.vsprops"
</div><div class='del'>-			CharacterSet="2"
</div><div class='del'>-			&gt;
</div><div class='del'>-			&lt;Tool