[MPlayer-cygwin] codec-cfg.h need patch

[Joey Parrish]

On Sat, Oct 09, 2004 at 01:47:06PM +0800, Goodwu wrote:
> When compiling the current cvs source code on my MinGW environment, I met the following error:
> gcc -c -I../libvo -I../../libvo  -O4 -march=i486 -mcpu=i686 -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I/c/devel/include  -I. -Inative -I.. -I../libmpdemux -I../loader -I/c/devel/include   -D_GNU_SOURCE -o ad_libvorbis.o ad_libvorbis.c
> In file included from c:/devel/include/ogg/os_types.h:40,
>                  from c:/devel/include/ogg/ogg.h:24,
>                  from c:/devel/include/vorbis/codec.h:26,
>                  from ad_libvorbis.c:31:
> c:/MinGW/include/basetyps.h:114: conflicting types for `GUID'
> ../codec-cfg.h:37: previous declaration of `GUID'
> make[1]: *** [ad_libvorbis.o] Error 1
> make[1]: Leaving directory `/c/cygwin/home/www/main/libmpcodecs'
> make: *** [libmpcodecs/libmpcodecs.a] Error 2
> 
> I think this patch should be applied:
> 
> $ cvs diff codec-cfg.h
> Index: codec-cfg.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
> retrieving revision 1.69
> diff -r1.69 codec-cfg.h
> 30a31
> > #define GUID_DEFINED

Send a unified diff.  cvs diff -u.  We can't apply this patch.

--Joey

-- 
All philosophy is naïve.