Mercurial > hg > xemacs-beta
changeset 2260:f913c1545598
[xemacs-hg @ 2004-09-10 18:46:58 by james]
Change log to log2 to avoid gcc3 shadow warnings.
| author | james |
|---|---|
| date | Fri, 10 Sep 2004 18:47:02 +0000 |
| parents | e77c2aea9fd8 |
| children | 7ffd8096e327 |
| files | src/ChangeLog src/alloc.c |
| diffstat | 2 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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--; } }