Re: master b1e9151: Enable the native display of BMP images on Haiku

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Eli Zaretskii]

> --- a/src/image.c
> +++ b/src/image.c
> @@ -11555,12 +11555,16 @@ syms_of_image (void)
> 
>  #if HAVE_NATIVE_IMAGE_API
>    DEFSYM (Qnative_image, "native-image");
> -# ifdef HAVE_NTGUI
> -  DEFSYM (Qgdiplus, "gdiplus");
> -  DEFSYM (Qshlwapi, "shlwapi");
> +
> +#if defined HAVE_NTGUI || defined HAVE_HAIKU
>    DEFSYM (Qbmp, "bmp");
>    add_image_type (Qbmp);
> -# endif
> +#endif
> +
> +#ifdef HAVE_NTGUI
> +  DEFSYM (Qgdiplus, "gdiplus");
> +  DEFSYM (Qshlwapi, "shlwapi");
> +#endif
>  #endif
> 
>    defsubr (&Sinit_image_library);

Shouldn't you now remove SEFSYM for Qbmp from haikuimage.c?

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

>> --- a/src/image.c
>> +++ b/src/image.c
>> @@ -11555,12 +11555,16 @@ syms_of_image (void)
>> 
>>  #if HAVE_NATIVE_IMAGE_API
>>    DEFSYM (Qnative_image, "native-image");
>> -# ifdef HAVE_NTGUI
>> -  DEFSYM (Qgdiplus, "gdiplus");
>> -  DEFSYM (Qshlwapi, "shlwapi");
>> +
>> +#if defined HAVE_NTGUI || defined HAVE_HAIKU
>>    DEFSYM (Qbmp, "bmp");
>>    add_image_type (Qbmp);
>> -# endif
>> +#endif
>> +
>> +#ifdef HAVE_NTGUI
>> +  DEFSYM (Qgdiplus, "gdiplus");
>> +  DEFSYM (Qshlwapi, "shlwapi");
>> +#endif
>>  #endif
>> 
>>    defsubr (&Sinit_image_library);

> Shouldn't you now remove SEFSYM for Qbmp from haikuimage.c?

Probably, but it doesn't hurt to keep multiple DEFSYMs around right?

Thanks.

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Cc: emacs-devel@gnu.org
> Date: Sat, 26 Mar 2022 20:33:36 +0800
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> --- a/src/image.c
> >> +++ b/src/image.c
> >> @@ -11555,12 +11555,16 @@ syms_of_image (void)
> >> 
> >>  #if HAVE_NATIVE_IMAGE_API
> >>    DEFSYM (Qnative_image, "native-image");
> >> -# ifdef HAVE_NTGUI
> >> -  DEFSYM (Qgdiplus, "gdiplus");
> >> -  DEFSYM (Qshlwapi, "shlwapi");
> >> +
> >> +#if defined HAVE_NTGUI || defined HAVE_HAIKU
> >>    DEFSYM (Qbmp, "bmp");
> >>    add_image_type (Qbmp);
> >> -# endif
> >> +#endif
> >> +
> >> +#ifdef HAVE_NTGUI
> >> +  DEFSYM (Qgdiplus, "gdiplus");
> >> +  DEFSYM (Qshlwapi, "shlwapi");
> >> +#endif
> >>  #endif
> >> 
> >>    defsubr (&Sinit_image_library);
> 
> > Shouldn't you now remove SEFSYM for Qbmp from haikuimage.c?
> 
> Probably, but it doesn't hurt to keep multiple DEFSYMs around right?

It's better not, I think.  We don't do that elsewhere, do we?

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

> It's better not, I think.  We don't do that elsewhere, do we?

I think there are a few cases, though probably not deliberate.  If you
insist on removing the definition in haikuimage.c, I don't see why not.

Thanks.

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Cc: emacs-devel@gnu.org
> Date: Sat, 26 Mar 2022 21:22:41 +0800
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > It's better not, I think.  We don't do that elsewhere, do we?
> 
> I think there are a few cases, though probably not deliberate.  If you
> insist on removing the definition in haikuimage.c, I don't see why not.

What are the arguments for leaving it in haikuimage.c?

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Po Lu <luangruo@yahoo.com>
>> Cc: emacs-devel@gnu.org
>> Date: Sat, 26 Mar 2022 21:22:41 +0800
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> > It's better not, I think.  We don't do that elsewhere, do we?
>> 
>> I think there are a few cases, though probably not deliberate.  If you
>> insist on removing the definition in haikuimage.c, I don't see why not.
>
> What are the arguments for leaving it in haikuimage.c?

Mainly so that if the DEFSYM in image.c is moved under some different
conditionals (or removed entirely), haikuimage.c will continue to work.

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Andreas Schwab]

On Mär 26 2022, Po Lu wrote:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> It's better not, I think.  We don't do that elsewhere, do we?
>
> I think there are a few cases, though probably not deliberate.  If you
> insist on removing the definition in haikuimage.c, I don't see why not.

DEFSYM by itself does nothing.  It's just a marker for make-docfile,
which removes duplicates anyway.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Eli Zaretskii]

> From: Po Lu <luangruo@yahoo.com>
> Cc: emacs-devel@gnu.org
> Date: Sat, 26 Mar 2022 21:47:50 +0800
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> From: Po Lu <luangruo@yahoo.com>
> >> Cc: emacs-devel@gnu.org
> >> Date: Sat, 26 Mar 2022 21:22:41 +0800
> >> 
> >> Eli Zaretskii <eliz@gnu.org> writes:
> >> 
> >> > It's better not, I think.  We don't do that elsewhere, do we?
> >> 
> >> I think there are a few cases, though probably not deliberate.  If you
> >> insist on removing the definition in haikuimage.c, I don't see why not.
> >
> > What are the arguments for leaving it in haikuimage.c?
> 
> Mainly so that if the DEFSYM in image.c is moved under some different
> conditionals (or removed entirely), haikuimage.c will continue to work.

Then I don't think we should keep it in haikuimage.c.  If it is ever
removed, haikuimage.c will fail to compile, and the error message will
tell exactly what's wrong.  We have similar issues with symbols used
in w32font.c that are declared elsewhere, for example.  Why would
haikuimage.c be treated differently?

Re: master b1e9151: Enable the native display of BMP images on Haiku

[Po Lu]

Eli Zaretskii <eliz@gnu.org> writes:

> Then I don't think we should keep it in haikuimage.c.  If it is ever
> removed, haikuimage.c will fail to compile, and the error message will
> tell exactly what's wrong.  We have similar issues with symbols used
> in w32font.c that are declared elsewhere, for example.  Why would
> haikuimage.c be treated differently?

No idea, I'll remove the duplicate definition.

Thanks for explaining.