* allow to compile with DEBUG defined, replaced by STRUTILS_DEBUG

packages/paszlib/infblock.pas

@@ -17,7 +17,7 @@ interface
 {$I zconf.inc}
 
 uses
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   strutils,
   {$ENDIF}
   zutil, zbase;
@@ -122,7 +122,7 @@ begin
     s.check := s.checkfn(uLong(0), pBytef(NIL), 0);
     z.adler := s.check;
   end;
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   Tracev('inflate:   blocks reset');
   {$ENDIF}
 end;
@@ -162,7 +162,7 @@ begin
   Inc(s^.zend, w);
   s^.checkfn := c;
   s^.mode := ZTYPE;
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   Tracev('inflate:   blocks allocated');
   {$ENDIF}
   inflate_blocks_reset(s^, z, Z_NULL);
@@ -244,7 +244,7 @@ begin
         case (t shr 1) of
           0:                         { stored }
             begin
-              {$IFDEF DEBUG}
+              {$IFDEF STRUTILS_DEBUG}
               if s.last then
                 Tracev('inflate:     stored block (last)')
               else
@@ -264,7 +264,7 @@ begin
           1:                         { fixed }
             begin
               begin
-                {$IFDEF DEBUG}
+                {$IFDEF STRUTILS_DEBUG}
                 if s.last then
                   Tracev('inflate:     fixed codes blocks (last)')
                 else
@@ -294,7 +294,7 @@ begin
             end;
           2:                         { dynamic }
             begin
-              {$IFDEF DEBUG}
+              {$IFDEF STRUTILS_DEBUG}
               if s.last then
                 Tracev('inflate:     dynamic codes block (last)')
               else
@@ -371,7 +371,7 @@ begin
         s.sub.left := uInt(b) and $ffff;
         k := 0;
         b := 0;                      { dump bits }
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Tracev('inflate:       stored length '+IntToStr(s.sub.left));
         {$ENDIF}
         if s.sub.left <> 0 then
@@ -457,7 +457,7 @@ begin
         Dec(s.sub.left, t);
         if (s.sub.left = 0) then
         begin
-          {$IFDEF DEBUG}
+          {$IFDEF STRUTILS_DEBUG}
           if (ptr2int(q) >= ptr2int(s.read)) then
             Tracev('inflate:       stored end '+
                 IntToStr(z.total_out + ptr2int(q) - ptr2int(s.read)) + ' total out')
@@ -537,7 +537,7 @@ begin
         Dec(k, 14);
 
         s.sub.trees.index := 0;
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Tracev('inflate:       table sizes ok');
         {$ENDIF}
         s.mode := BTREE;
@@ -605,7 +605,7 @@ begin
           exit;
         end;
         s.sub.trees.index := 0;
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Tracev('inflate:       bits tree ok');
         {$ENDIF}
         s.mode := DTREE;
@@ -760,7 +760,7 @@ begin
             inflate_blocks := inflate_flush(s,z,r);
             exit;
           end;
-          {$IFDEF DEBUG}
+          {$IFDEF STRUTILS_DEBUG}
           Tracev('inflate:       trees ok');
           {$ENDIF}
           { c renamed to cs }
@@ -813,7 +813,7 @@ begin
           m := uInt(ptr2int(s.read)-ptr2int(q)-1)
         else
           m := uInt(ptr2int(s.zend)-ptr2int(q));
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         if (ptr2int(q) >= ptr2int(s.read)) then
           Tracev('inflate:       codes end '+
               IntToStr(z.total_out + ptr2int(q) - ptr2int(s.read)) + ' total out')
@@ -830,7 +830,7 @@ begin
         {$ifndef patch112}
         if (k > 7) then           { return unused byte, if any }
         begin
-          {$IFDEF DEBUG}
+          {$IFDEF STRUTILS_DEBUG}
           Assert(k < 16, 'inflate_codes grabbed too many bytes');
           {$ENDIF}
           Dec(k, 8);
@@ -924,7 +924,7 @@ begin
   ZFREE(z, s^.window);
   ZFREE(z, s^.hufts);
   ZFREE(z, s);
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   Trace('inflate:   blocks freed');
   {$ENDIF}
   inflate_blocks_free := Z_OK;
@@ -951,4 +951,4 @@ begin
   inflate_blocks_sync_point := int(s.mode = LENS);
 end;
 
-end.
+end.

packages/paszlib/infcodes.pas

@@ -13,7 +13,7 @@ interface
 {$I zconf.inc}
 
 uses
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   strutils,
   {$ENDIF}
   zutil, zbase;
@@ -53,7 +53,7 @@ begin
     c^.dbits := Byte(bd);
     c^.ltree := tl;
     c^.dtree := td;
-    {$IFDEF DEBUG}
+    {$IFDEF STRUTILS_DEBUG}
     Tracev('inflate:       codes new');
     {$ENDIF}
   end;
@@ -170,7 +170,7 @@ begin
       if (e = 0) then            { literal }
       begin
         c^.sub.lit := t^.base;
-       {$IFDEF DEBUG}
+       {$IFDEF STRUTILS_DEBUG}
         if (t^.base >= $20) and (t^.base < $7f) then
           Tracevv('inflate:         literal '+char(t^.base))
         else
@@ -194,7 +194,7 @@ begin
       end;
       if (e and 32 <> 0) then            { end of block }
       begin
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Tracevv('inflate:         end of block');
         {$ENDIF}
         c^.mode := WASH;
@@ -246,7 +246,7 @@ begin
 
       c^.sub.code.need := c^.dbits;
       c^.sub.code.tree := c^.dtree;
-      {$IFDEF DEBUG}
+      {$IFDEF STRUTILS_DEBUG}
       Tracevv('inflate:         length '+IntToStr(c^.len));
       {$ENDIF}
       c^.mode := DIST;
@@ -340,7 +340,7 @@ begin
       {DUMPBITS(j);}
       b := b shr j;
       Dec(k, j);
-      {$IFDEF DEBUG}
+      {$IFDEF STRUTILS_DEBUG}
       Tracevv('inflate:         distance '+ IntToStr(c^.sub.copy.dist));
       {$ENDIF}
       c^.mode := COPY;
@@ -486,7 +486,7 @@ begin
       {$ifdef patch112}
       if (k > 7) then           { return unused byte, if any }
       begin
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Assert(k < 16, 'inflate_codes grabbed too many bytes');
         {$ENDIF}
         Dec(k, 8);
@@ -568,9 +568,9 @@ procedure inflate_codes_free(c : pInflate_codes_state;
                              var z : z_stream);
 begin
   ZFREE(z, c);
-  {$IFDEF DEBUG}
+  {$IFDEF STRUTILS_DEBUG}
   Tracev('inflate:       codes free');
   {$ENDIF}
 end;
 
-end.
+end.

packages/paszlib/inffast.pas

@@ -16,7 +16,7 @@ interface
 {$I zconf.inc}
 
 uses
-  {$ifdef DEBUG}
+  {$ifdef STRUTILS_DEBUG}
   strutils,
   {$ENDIF}
   zutil, zbase;
@@ -97,7 +97,7 @@ begin
       {DUMPBITS(t^.bits);}
       b := b shr t^.bits;
       Dec(k, t^.bits);
-     {$IFDEF DEBUG}
+     {$IFDEF STRUTILS_DEBUG}
       if (t^.base >= $20) and (t^.base < $7f) then
         Tracevv('inflate:         * literal '+char(t^.base))
       else
@@ -121,7 +121,7 @@ begin
         {DUMPBITS(e);}
         b := b shr e;
         Dec(k, e);
-        {$IFDEF DEBUG}
+        {$IFDEF STRUTILS_DEBUG}
         Tracevv('inflate:         * length ' + IntToStr(c));
         {$ENDIF}
         { decode distance base of block to copy }
@@ -159,7 +159,7 @@ begin
             b := b shr e;
             Dec(k, e);
 
-            {$IFDEF DEBUG}
+            {$IFDEF STRUTILS_DEBUG}
             Tracevv('inflate:         * distance '+IntToStr(d));
             {$ENDIF}
             { do the copy }
@@ -239,7 +239,7 @@ begin
           b := b shr t^.bits;
           Dec(k, t^.bits);
 
-         {$IFDEF DEBUG}
+         {$IFDEF STRUTILS_DEBUG}
           if (t^.base >= $20) and (t^.base < $7f) then
             Tracevv('inflate:         * literal '+char(t^.base))
           else
@@ -254,7 +254,7 @@ begin
       else
         if (e and 32 <> 0) then
         begin
-          {$IFDEF DEBUG}
+          {$IFDEF STRUTILS_DEBUG}
           Tracevv('inflate:         * end of block');
           {$ENDIF}
           {UNGRAB}
@@ -315,4 +315,4 @@ begin
   inflate_fast := Z_OK;
 end;
 
-end.
+end.