diff options
| author | Ken Raeburn | 2001-01-08 19:35:06 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2001-01-08 19:35:06 +0000 |
| commit | f47a9ec42bfe64c316473c64c847922bbbce2063 (patch) | |
| tree | 1cd74b169ede6f4cc13b73daa906c42f8ae0e6e3 /src | |
| parent | 5afd1b9cc3f1664cc2c659666f06b6f1454358f7 (diff) | |
| download | emacs-f47a9ec42bfe64c316473c64c847922bbbce2063.tar.gz emacs-f47a9ec42bfe64c316473c64c847922bbbce2063.zip | |
* xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
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 @@ | |||
| 1 | 2001-01-08 Ken Raeburn <raeburn@gnu.org> | ||
| 2 | |||
| 3 | * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I | ||
| 4 | in inner block. | ||
| 5 | |||
| 1 | 2001-01-08 Gerd Moellmann <gerd@gnu.org> | 6 | 2001-01-08 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * window.c (window_scroll_pixel_based): Adjust glyph matrices | 8 | * 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) | |||
| 7331 | #ifdef ALLOC_XPM_COLORS | 7331 | #ifdef ALLOC_XPM_COLORS |
| 7332 | img->colors = colors_in_color_table (&img->ncolors); | 7332 | img->colors = colors_in_color_table (&img->ncolors); |
| 7333 | #else /* not ALLOC_XPM_COLORS */ | 7333 | #else /* not ALLOC_XPM_COLORS */ |
| 7334 | int i; | ||
| 7335 | |||
| 7334 | img->ncolors = attrs.nalloc_pixels; | 7336 | img->ncolors = attrs.nalloc_pixels; |
| 7335 | img->colors = (unsigned long *) xmalloc (img->ncolors | 7337 | img->colors = (unsigned long *) xmalloc (img->ncolors |
| 7336 | * sizeof *img->colors); | 7338 | * sizeof *img->colors); |