[MPlayer-dev-eng] inclusion of loader/drv.h causes 1000+ conflicts with mingw headers

[Diego Biurrun]

On Thu, Mar 18, 2010 at 02:17:40PM +0100, Gianluigi Tiesi wrote:
> On Thu, Mar 18, 2010 at 11:49:16AM +0100, Diego Biurrun wrote:
> > On Thu, Mar 18, 2010 at 01:29:25AM +0100, Gianluigi Tiesi wrote:
> > > I think it's better to declare the function instead
> > > of the include
> > > 
> > > something like:
> > > extern void SetCodecPath(const char* path);
> > > 
> > > it only uses const char * as argument
> > 
> > I don't see a patch attached to this email.
> 
> there is no patch :D
> 
> but anyway I've have one
> 
> --- main/mencoder.c	2010-03-18 00:39:09.734375000 +0100
> +++ sherpya/mencoder.c	2010-03-18 01:31:55.125000000 +0100
> @@ -66,7 +66,7 @@
>  
>  #ifdef CONFIG_WIN32DLL
> -#include "loader/drv.h"         // for SetCodecPath()
> +extern void SetCodecPath(const char* path);
>  #endif
>  
> --- main/mplayer.c	2010-03-18 00:39:09.734375000 +0100
> +++ sherpya/mplayer.c	2010-03-18 01:31:43.015625000 +0100
> @@ -96,7 +96,7 @@
>  
>  #ifdef CONFIG_WIN32DLL
> -#include "loader/drv.h"         // for SetCodecPath()
> +extern void SetCodecPath(const char* path);
>  #endif

Rejected.  This adds the declaration twice and the #ifdefs are
no longer needed.

Diego