diff options
| author | Juanma Barranquero | 2013-07-04 04:08:56 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2013-07-04 04:08:56 +0200 |
| commit | 7a35b20f3bce92a3dc47c7b33452dd0611645566 (patch) | |
| tree | 9516f1cd680e647f96ca56d3f9ed51bb18a93899 /src | |
| parent | 1ce5cd04df32ebdd269709de23feb5493458173c (diff) | |
| download | emacs-7a35b20f3bce92a3dc47c7b33452dd0611645566.tar.gz emacs-7a35b20f3bce92a3dc47c7b33452dd0611645566.zip | |
src/image: Remove unused variables.
(x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'.
(x_build_heuristic_mask) [HAVE_NTGUI]: Remove unused var `frame_dc'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5391cefe876..f8d54c7fb03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-07-04 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * image.c (x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'. | ||
| 4 | (x_build_heuristic_mask) [HAVE_NTGUI]: Remove unused var `frame_dc'. | ||
| 5 | |||
| 1 | 2013-07-04 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2013-07-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Try to fix FreeBSD bug re multithreaded memory allocation (Bug#14569). | 8 | Try to fix FreeBSD bug re multithreaded memory allocation (Bug#14569). |
diff --git a/src/image.c b/src/image.c index 2c288342028..2f9a8442256 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -4559,7 +4559,6 @@ x_to_xcolors (struct frame *f, struct image *img, bool rgb_p) | |||
| 4559 | XColor *colors, *p; | 4559 | XColor *colors, *p; |
| 4560 | XImagePtr_or_DC ximg; | 4560 | XImagePtr_or_DC ximg; |
| 4561 | #ifdef HAVE_NTGUI | 4561 | #ifdef HAVE_NTGUI |
| 4562 | HDC hdc; | ||
| 4563 | HGDIOBJ prev; | 4562 | HGDIOBJ prev; |
| 4564 | #endif /* HAVE_NTGUI */ | 4563 | #endif /* HAVE_NTGUI */ |
| 4565 | 4564 | ||
| @@ -4929,7 +4928,6 @@ x_build_heuristic_mask (struct frame *f, struct image *img, Lisp_Object how) | |||
| 4929 | #ifndef HAVE_NTGUI | 4928 | #ifndef HAVE_NTGUI |
| 4930 | XImagePtr mask_img; | 4929 | XImagePtr mask_img; |
| 4931 | #else | 4930 | #else |
| 4932 | HDC frame_dc; | ||
| 4933 | HGDIOBJ prev; | 4931 | HGDIOBJ prev; |
| 4934 | char *mask_img; | 4932 | char *mask_img; |
| 4935 | int row_width; | 4933 | int row_width; |