# HG changeset patch
# User james
# Date 1094842022 0
# Node ID f913c154559859a3823741ab4fbe7048204c72ff
# Parent  e77c2aea9fd87658e92fa2f54f99d45945bbc15a
[xemacs-hg @ 2004-09-10 18:46:58 by james]
Change log to log2 to avoid gcc3 shadow warnings.

diff -r e77c2aea9fd8 -r f913c1545598 src/ChangeLog
--- a/src/ChangeLog	Fri Sep 10 11:58:33 2004 +0000
+++ b/src/ChangeLog	Fri Sep 10 18:47:02 2004 +0000
@@ -1,3 +1,8 @@
+2004-08-18  Felix H. Gatzemeier  <f.g@tzemeier.info>
+
+	* alloc.c (malloced_storage_size): Renamed log to log2, twice,
+	to fix a shadow warning in gcc 3.3.4.
+
 2004-09-10  Malcolm Purvis  <malcolmp@xemacs.org>
 
 	* Makefile.in.in: Enable support for parallel builds.
diff -r e77c2aea9fd8 -r f913c1545598 src/alloc.c
--- a/src/alloc.c	Fri Sep 10 11:58:33 2004 +0000
+++ b/src/alloc.c	Fri Sep 10 18:47:02 2004 +0000
@@ -5143,20 +5143,21 @@
 # endif
   if (claimed_size < 4096)
     {
-      int log = 1;
+      /* fxg: rename log->log2 to supress gcc3 shadow warning */
+      int log2 = 1;
 
       /* compute the log base two, more or less, then use it to compute
 	 the block size needed. */
       claimed_size--;
       /* It's big, it's heavy, it's wood! */
       while ((claimed_size /= 2) != 0)
-	++log;
+	++log2;
       claimed_size = 1;
       /* It's better than bad, it's good! */
-      while (log > 0)
+      while (log2 > 0)
         {
 	  claimed_size *= 2;
-          log--;
+          log2--;
         }
       /* We have to come up with some average about the amount of
 	 blocks used. */
@@ -5184,20 +5185,21 @@
   claimed_size += 8;
 # endif
   {
-    int log = 1;
+    /* fxg: rename log->log2 to supress gcc3 shadow warning */
+    int log2 = 1;
 
     /* compute the log base two, more or less, then use it to compute
        the block size needed. */
     claimed_size--;
     /* It's big, it's heavy, it's wood! */
     while ((claimed_size /= 2) != 0)
-      ++log;
+      ++log2;
     claimed_size = 1;
     /* It's better than bad, it's good! */
-    while (log > 0)
+    while (log2 > 0)
       {
 	claimed_size *= 2;
-        log--;
+        log2--;
       }
   }