[FFmpeg-cvslog] r9988 - in trunk: configure libavformat/network.h libavformat/os_support.c libavformat/os_support.h

[Víctor Paesa]

Hi,

On 8/9/07, V?ctor Paesa <victorpaesa at googlemail.com> wrote:
> Hi,
>
> On 8/9/07, Ramiro Ribeiro Polla wrote:
> >  wrote:
> > > Hi
> > >
> > >
> > >> @@ -1534,6 +1535,7 @@ check_header termios.h
> > >>  check_header conio.h
> > >>
> > >>  check_header arpa/inet.h
> > >> +check_header winsock2.h
> > >>
> > >>  check_func inet_aton
> > >>  enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"
> > >>
> > >
> > > That broke Cygwin, as has both inet and winsock2.
> > >
> > > Changing the line to
> > >
> > > check_header arpa/inet.h || check_header winsock2.h
> > >
> > > fixes it for Cygwin, I'll check this night MinGW how are going cross-buildings.
> > >
> > >
> >
> > I didn't test on MinGW yet, but what do you think about this one?
>
> Much more complete, I prefer yours.
> That would fix Cygwin builds, but cross-compilation failed (probably
> fails since some
> time ago).
>
> I used:
> ./configure --target-os=mingw32 --enable-memalign-hack --enable-shared
> --disable-static --extra-cflags=-mno-cygwin --extra-libs="-mno-cygwin
> -lws2_32"
>
> and I got:
>
>
> gcc -I"/home/Inma/src/ffmpeg-svn/ffmpeg"/libavcodec
> -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -D_ISOC9X_SOURCE -I"/home/Inma/src/ffmpeg-mng-10027"
> -I"/home/Inma/src/ffmpeg-svn/ffmpeg"
> -I"/home/Inma/src/ffmpeg-svn/ffmpeg"/libavutil -mno-cygwin
> -fomit-frame-pointer -g -Wdeclaration-after-statement -Wall
> -Wno-switch -Wdisabled-optimization -Wpointer-arith -Wredundant-decls
> -O3  -c -o os_support.o
> /home/Inma/src/ffmpeg-svn/ffmpeg/libavformat/os_support.c
> In file included from
> /home/Inma/src/ffmpeg-svn/ffmpeg/libavformat/os_support.c:29:
> /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32api/winsock2.h:538:
> error: conflicting types for 'close'
> /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../i686-pc-mingw32/include/io.h:278:
> error: previous declaration of 'close' was here
> /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../include/w32api/winsock2.h:538:
> error: conflicting types for 'close'
> /usr/lib/gcc/i686-pc-mingw32/3.4.4/../../../../i686-pc-mingw32/include/io.h:278:
> error: previous declaration of 'close' was here
> make[1]: *** [os_support.o] Error 1
>
> The error persisted when I added --disable-network.
>
> I'm travelling for a week and I can't delve into this more, I will
> retake it at my return.
>

Oops, now I see that error is exactly what Andrea Barbieri has
reported at ffmpeg-users ...