[vlc-devel] [PATCH] dvbpsi: add sys/types.h as appropriate

[Timothy Gu]

On Jul 1, 2014 8:25 AM, "Sean McGovern" <gseanmcg at gmail.com> wrote:
>
>
>
>
> On Tue, Jul 1, 2014 at 9:30 AM, Jean-Paul Saman <jpsaman at videolan.org>
wrote:
>>
>> Yes I saw, thank you.
>>
>> Kind regards
>>
>> Jean-Paul Saman
>>
>>
>> On Sun, Jun 29, 2014 at 4:31 PM, Timothy Gu <timothygu99 at gmail.com>
wrote:
>>>
>>>
>>> On Jun 29, 2014 6:14 AM, "Jean-Paul Saman" <jpsaman at videolan.org> wrote:
>>> >
>>> >
>>> > On Fri, Jun 27, 2014 at 7:00 PM, Rafaël Carré <funman at videolan.org>
wrote:
>>> >>
>>> >> On 06/27/14 16:47, Sean McGovern wrote:
>>> >> > On Tuesday, June 24, 2014, Sean McGovern <gseanmcg at gmail.com>
wrote:
>>> >> >> ---
>>> >> >>  contrib/src/dvbpsi/dvbpsi-solaris-types.patch |   12 ++++++++++++
>>> >> >>  contrib/src/dvbpsi/rules.mak                  |    1 +
>>> >> >>  2 files changed, 13 insertions(+)
>>> >> >>  create mode 100644 contrib/src/dvbpsi/dvbpsi-solaris-types.patch
>>> >> >>
>>> >> >> diff --git a/contrib/src/dvbpsi/dvbpsi-solaris-types.patch
>>> >> > b/contrib/src/dvbpsi/dvbpsi-solaris-types.patch
>>> >> >> new file mode 100644
>>> >> >> index 0000000..51b1cb9
>>> >> >> --- /dev/null
>>> >> >> +++ b/contrib/src/dvbpsi/dvbpsi-solaris-types.patch
>>> >> >> @@ -0,0 +1,12 @@
>>> >> >> +--- libdvbpsi/src/descriptor.c.ORIG    Sun Nov 10 07:13:35 2013
>>> >> >> ++++ libdvbpsi/src/descriptor.c Mon Mar  3 22:30:36 2014
>>> >> >> +@@ -29,6 +29,9 @@
>>> >> >> + #include <stdlib.h>
>>> >> >> + #include <stdbool.h>
>>> >> >> + #include <string.h>
>>> >> >> ++#if defined(__sun)
>>> >> >> ++#include <sys/types.h>
>>> >> >> ++#endif
>>> >> >> +
>>> >> >> + #if defined(HAVE_INTTYPES_H)
>>> >> >> + #include <inttypes.h>
>>> >> >> diff --git a/contrib/src/dvbpsi/rules.mak
b/contrib/src/dvbpsi/rules.mak
>>> >> >> index 454fdbe..5f52809 100644
>>> >> >> --- a/contrib/src/dvbpsi/rules.mak
>>> >> >> +++ b/contrib/src/dvbpsi/rules.mak
>>> >> >> @@ -17,6 +17,7 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2
>>> >> > .sum-dvbpsi
>>> >> >>         $(UNPACK)
>>> >> >>         $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv
config.guess
>>> >> > config.sub .auto
>>> >> >>         $(APPLY) $(SRC)/dvbpsi/dvbpsi-noexamples.patch
>>> >> >> +       $(APPLY) $(SRC)/dvbpsi/dvbpsi-solaris-types.patch
>>> >> >>         $(MOVE)
>>> >> >>
>>> >> >>  .dvbpsi: libdvbpsi
>>> >> >> --
>>> >> >
>>> >> > Ping!
>>> >>
>>> >> Jean-Paul ?
>>> >
>>> >
>>> > Thanks I'll look into it.
>>>
>>> This patch is also needed for MinGW, not only for Sun. See
https://mailman.videolan.org/pipermail/libdvbpsi-devel/2014-June/000737.html
>>>
>>> Timothy
>
>
> Hi,
>
> Is it better to patch the header or the .c file?
>
> Can we combine and re-submit this patch? Do you want to do that Timothy
or should I?

Definitely the header. The header uses `ssize_t` at line 168 [1]. I wonder
how the patch to only the .c even works for you. Log for i686-pc-mingw32
without patch:

libtool: compile: i686-pc-mingw32-gcc -DHAVE_CONFIG_H -I. -I.. -g -O2 -Wall
-Werror --std=gnu99 -D_GNU_SOURCE -Wpointer-arith -Wcast-align -Wcast-qual
-Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes
-Wnested-externs -Wsign-compare -MT dvbpsi.lo -MD -MP -MF .deps/dvbpsi.Tpo
-c dvbpsi.c -o dvbpsi.o In file included from descriptor.c:42:0:
descriptor.h:168:58: error: unknown type name 'ssize_t' void
*dvbpsi_DuplicateDecodedDescriptor(void *p_decoded, ssize_t i_size); ^
descriptor.c:162:58: error: unknown type name 'ssize_t' void
*dvbpsi_DuplicateDecodedDescriptor(void *p_decoded, ssize_t i_size) ^

Can you submit the patch? I'm a little busy lately.

Timothy

[1]
http://git.videolan.org/?p=libdvbpsi.git;a=blob;f=src/descriptor.h;h=f344a730a06c5d8d0f599fbcffdf12e24f64b508;hb=HEAD#l168
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20140702/5ab0b6ca/attachment.html>