Re: [PATCH] Fix compilation errors due to a wrong declaration of iconv() on OS/2

This is a multi-part message in MIME format.
--------------050508070702010603030702
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Hi/2.

Alexander Strasser wrote:
> Hi/2 KO Myung-Hun :)
> 
> On 2025-01-09 14:36 +0900, KO Myung-Hun wrote:
>> Recent compilers such as GCC 14 generate errors for implicit casts.
>> ---
>>  configure             |  3 ++-
>>  osdep/include/iconv.h | 32 ++++++++++++++++++++++++++++++++
>>  2 files changed, 34 insertions(+), 1 deletion(-)
>>  create mode 100644 osdep/include/iconv.h
>>
>> diff --git a/configure b/configure
>> index 753e14446..e6634bba2 100755
>> --- a/configure
>> +++ b/configure
>> @@ -1961,7 +1961,8 @@ if os2 ; then
>>    test -n "$ld_static" && ld_static='-Wl,-static'
>>    # OS/2 linker does not support a thin archive. Remove 'T' flag.
>>    _arflags=$(echo $_arflags | tr -d T)
>> -  extra_cflags="$extra_cflags -D_EMX_SOURCE"
>> +  # -Iosdep/include is for MPlayer, -I../osdep/include is for FFmpeg
>> +  extra_cflags="$extra_cflags -D_EMX_SOURCE -Iosdep/include -I../osdep/include"
>>  fi
> 
> It's a bit unusual compared to the normal use of headers in osdep/ .
> It should probably work OK though.
> 
> Maybe we should actually change it in the rest of the code base to
> work this way, but that would require more careful planning, because
> than it's no more possible to select the usage per os, like you do
> here, which is also a bit different.
> 
> Or at some point we switch it to the FFmpeg compat scheme. Dunno...
>  

Then how about this patch? It's more simple.

>>  if wine ; then
>> diff --git a/osdep/include/iconv.h b/osdep/include/iconv.h
>> new file mode 100644
>> index 000000000..daf6d1108
>> --- /dev/null
>> +++ b/osdep/include/iconv.h
>> @@ -0,0 +1,32 @@
>> +/*
>> + * iconv.h for platforms such as OS/2 with non-POSIX compliant iconv.h
>> + *
>> + * Copyright (c) 2025 KO Myung-Hun ([email protected])
>> + *
>> + * This file is part of MPlayer.
>> + *
>> + * MPlayer is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; either version 2 of the License, or
>> + * (at your option) any later version.
>> + *
>> + * MPlayer is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License along
>> + * with MPlayer; if not, write to the Free Software Foundation, Inc.,
>> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>> + */
>> +
>> +#ifndef MPLAYER_ICONV_H
>> +#define MPLAYER_ICONV_H
>> +
>> +#define iconv iconv_not_posix
>> +#include_next <iconv.h>
>> +
>> +#undef iconv
>> +size_t iconv(iconv_t, char **, size_t *, char **, size_t *);
>> +
>> +#endif
>> --
> 
> This is similar to the tricks done in FFmpeg compat.
> 

It's GNULIB style. :)

> For now I'm OK with this patch for OS/2 even though it is not in line
> with typical osdep usage.
> 
> Maybe wait a few more days, if someone else wants to comment.
> 

Thanks!

-- 
KO Myung-Hun

Korean OS/2 User Community : https://www.os2.kr/

--------------050508070702010603030702
Content-Type: application/x-patch;
 name="v2-0001-Fix-compilation-errors-due-to-a-wrong-declaration.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename*0="v2-0001-Fix-compilation-errors-due-to-a-wrong-declaration.pa";
 filename*1="tch"

RnJvbSAxNjdiMmMzMzYwYjE1M2M0NDRiMGU2NWVkZjM0YjZkNDM4MDg5NTMzIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLTyBNeXVuZy1IdW4gPGtvbWg3OEBnbWFpbC5jb20+
CkRhdGU6IFRodSwgMTYgSmFuIDIwMjUgMjI6MTI6MzEgKzA5MDAKU3ViamVjdDogW1BBVENI
IHYyXSBGaXggY29tcGlsYXRpb24gZXJyb3JzIGR1ZSB0byBhIHdyb25nIGRlY2xhcmF0aW9u
IG9mCiBpY29udigpIG9uIE9TLzIKClJlY2VudCBjb21waWxlcnMgc3VjaCBhcyBHQ0MgMTQg
Z2VuZXJhdGUgZXJyb3JzIGZvciBpbXBsaWNpdCBjYXN0cy4KLS0tCiBjb25maWd1cmUgfCA1
ICsrKystCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0p
CgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJlCmluZGV4IDc1M2UxNDQ0Ni4u
NDk4OWRmYTc3IDEwMDc1NQotLS0gYS9jb25maWd1cmUKKysrIGIvY29uZmlndXJlCkBAIC0x
OTYxLDcgKzE5NjEsMTAgQEAgaWYgb3MyIDsgdGhlbgogICB0ZXN0IC1uICIkbGRfc3RhdGlj
IiAmJiBsZF9zdGF0aWM9Jy1XbCwtc3RhdGljJwogICAjIE9TLzIgbGlua2VyIGRvZXMgbm90
IHN1cHBvcnQgYSB0aGluIGFyY2hpdmUuIFJlbW92ZSAnVCcgZmxhZy4KICAgX2FyZmxhZ3M9
JChlY2hvICRfYXJmbGFncyB8IHRyIC1kIFQpCi0gIGV4dHJhX2NmbGFncz0iJGV4dHJhX2Nm
bGFncyAtRF9FTVhfU09VUkNFIgorICAjIE9TLzIgaWNvbnYoKSBoYXMgYSBkaWZmZXJlbnQg
cG9pbnRlciBkZWNsYXJhdGlvbiBmcm9tIFBPU0lYLiBUaGlzIGhhcyBubworICAjIHByb2Js
ZW1zIHVwIHRvIEdDQzEzLCBidXQgc2luY2UgR0NDMTQgdGhpcyBpcyB0cmVhdGVkIGFzIGFu
IGVycm9ycy4KKyAgIyBUcmVhdCBpdCBhcyB3YXJuaW5ncyBub3QgZXJyb3JzLgorICBleHRy
YV9jZmxhZ3M9IiRleHRyYV9jZmxhZ3MgLURfRU1YX1NPVVJDRSAtV25vLWVycm9yPWluY29t
cGF0aWJsZS1wb2ludGVyLXR5cGVzIgogZmkKIAogaWYgd2luZSA7IHRoZW4KLS0gCjIuNDIu
MAoK
--------------050508070702010603030702
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
MPlayer-dev-eng mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng

--------------050508070702010603030702--