changeset: 5537:2df2d9171f20
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Mon Aug 08 13:57:18 2011 +0900
files: src/ChangeLog src/glyphs-eimage.c
description:
Suppress a "shadowed local" warning.
diff -r bbcf3f979099 -r 2df2d9171f20 src/ChangeLog
--- 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(a)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(a)xemacs.org>
* glyphs-eimage.c (_LARGEFILE64_SOURCE, _FILE_OFFSET_BITS):
diff -r bbcf3f979099 -r 2df2d9171f20 src/glyphs-eimage.c
--- 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));
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches