summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>2001-01-08 19:35:06 +0000
committerKen Raeburn <raeburn@raeburn.org>2001-01-08 19:35:06 +0000
commitf47a9ec42bfe64c316473c64c847922bbbce2063 (patch)
tree1cd74b169ede6f4cc13b73daa906c42f8ae0e6e3
parent5afd1b9cc3f1664cc2c659666f06b6f1454358f7 (diff)
downloademacs-f47a9ec42bfe64c316473c64c847922bbbce2063.tar.gz
* xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9bb979690d4..b980a9524b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-08 Ken Raeburn <raeburn@gnu.org>
+
+ * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I
+ in inner block.
+
2001-01-08 Gerd Moellmann <gerd@gnu.org>
* window.c (window_scroll_pixel_based): Adjust glyph matrices
diff --git a/src/xfns.c b/src/xfns.c
index 1d277b081c8..037a0baa294 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -7331,6 +7331,8 @@ xpm_load (f, img)
#ifdef ALLOC_XPM_COLORS
img->colors = colors_in_color_table (&img->ncolors);
#else /* not ALLOC_XPM_COLORS */
+ int i;
+
img->ncolors = attrs.nalloc_pixels;
img->colors = (unsigned long *) xmalloc (img->ncolors
* sizeof *img->colors);