bug#17790: GIFlib-5.1.0 or former conditional

[Andreas Schwab]

Makoto Fujiwara <makoto@ki.nu> writes:

> +#if (GIFLIB_MAJOR == 5) && (GIFLIB_MINOR > 0)  

What about libgif6?  Please remove the extra parens.

> +  int * return_value_p;

This is not a predicate, please remove _p.

> +#endif
>    /* Before reading entire contents, check the declared image size. */
>    if (!check_image_size (f, gif->SWidth, gif->SHeight))
>      {
>        image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
> +#if (GIFLIB_MAJOR == 5) && (GIFLIB_MINOR > 0)
> +      fn_DGifCloseFile (gif, return_value_p);
> +      return *return_value_p;

What is the meaning of the return value?  Is it compatible with the
intented bool value?

> @@ -7650,7 +7683,11 @@ gif_load (struct frame *f, struct image 
>                           Fcons (make_number (gif->ImageCount),
>                                  img->lisp_data));
>  
> +#if (GIFLIB_MAJOR == 5) && (GIFLIB_MINOR > 0)
> +  fn_DGifCloseFile (gif, return_value_p);

What happens with the return value?

Also, you didn't change all uses of DGifCloseFile, see line 7253:

DEF_IMGLIB_FN (int, DGifCloseFile, (GifFileType *));

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."