Mercurial > hg > xemacs-beta

changeset 5537:2df2d9171f20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Suppress a "shadowed local" warning.
author Stephen J. Turnbull <stephen@xemacs.org>
date Mon, 08 Aug 2011 13:57:18 +0900
parents bbcf3f979099
children 580ef98f2beb
files src/ChangeLog src/glyphs-eimage.c
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Aug 08 13:57:18 2011 +0900
+++ b/src/ChangeLog	Mon Aug 08 13:57:18 2011 +0900
@@ -1,3 +1,8 @@
+2011-08-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* glyphs-eimage.c (png_instantiate): Rename a shadowing loop index
+	which shadows another local to quiet GCC.
+
 2011-08-03  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* glyphs-eimage.c (_LARGEFILE64_SOURCE, _FILE_OFFSET_BITS):
--- a/src/glyphs-eimage.c	Mon Aug 08 13:57:18 2011 +0900
+++ b/src/glyphs-eimage.c	Mon Aug 08 13:57:18 2011 +0900
@@ -1088,20 +1088,20 @@
      * into the glyph code, where you can get to it from lisp
      * anyway. - WMP */
     {
-      int ii, num_text = 0;
+      int i, num_text = 0;
       png_textp text_ptr = NULL;
       DECLARE_EISTRING (key);
       DECLARE_EISTRING (text);
 
       if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_text) > 0)
         {
-          for (ii = 0 ; ii < num_text; ii++)
+          for (i = 0 ; i < num_text; i++)
             {
               eireset (key);
               eireset (text);
 
-              eicpy_ext (key, text_ptr[ii].key, Qbinary);
-              eicpy_ext (text, text_ptr[ii].text, Qbinary);
+              eicpy_ext (key, text_ptr[i].key, Qbinary);
+              eicpy_ext (text, text_ptr[i].text, Qbinary);
 
               warn_when_safe (Qpng, Qinfo, "%s - %s", eidata (key),
                               eidata (text));