diff options
| author | Eli Zaretskii | 2014-06-18 19:35:02 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-06-18 19:35:02 +0300 |
| commit | 4335f42176d2cc7a20ef0348ad3c28ab604f95b5 (patch) | |
| tree | ae25d9b02e15d6a1b0fd7af6720cf303d0e34672 /src | |
| parent | b86b15b22117e9aab6e6a033d9a541441acdecb4 (diff) | |
| download | emacs-4335f42176d2cc7a20ef0348ad3c28ab604f95b5.tar.gz emacs-4335f42176d2cc7a20ef0348ad3c28ab604f95b5.zip | |
src/image.c: Fix last commit.
Fixes: debbugs:17790
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 3255982a157..4e4447167d2 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7338,9 +7338,11 @@ gif_close (GifFileType *gif, int *err) | |||
| 7338 | retval = fn_DGifCloseFile (gif, err); | 7338 | retval = fn_DGifCloseFile (gif, err); |
| 7339 | #else | 7339 | #else |
| 7340 | retval = fn_DGifCloseFile (gif); | 7340 | retval = fn_DGifCloseFile (gif); |
| 7341 | #if GIFLIB_MAJOR >= 5 | ||
| 7341 | if (err) | 7342 | if (err) |
| 7342 | *err = gif->Error; | 7343 | *err = gif->Error; |
| 7343 | #endif | 7344 | #endif |
| 7345 | #endif | ||
| 7344 | } | 7346 | } |
| 7345 | 7347 | ||
| 7346 | /* Load GIF image IMG for use on frame F. Value is true if | 7348 | /* Load GIF image IMG for use on frame F. Value is true if |
| @@ -7366,9 +7368,7 @@ gif_load (struct frame *f, struct image *img) | |||
| 7366 | Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL); | 7368 | Lisp_Object specified_data = image_spec_value (img->spec, QCdata, NULL); |
| 7367 | unsigned long bgcolor = 0; | 7369 | unsigned long bgcolor = 0; |
| 7368 | EMACS_INT idx; | 7370 | EMACS_INT idx; |
| 7369 | #if GIFLIB_MAJOR >= 5 | ||
| 7370 | int gif_err; | 7371 | int gif_err; |
| 7371 | #endif | ||
| 7372 | 7372 | ||
| 7373 | if (NILP (specified_data)) | 7373 | if (NILP (specified_data)) |
| 7374 | { | 7374 | { |