[MPlayer-cvslog] CVS: main/libvo vo_directx.c,1.52,1.53

[Joey Parrish]

On Tue, Jun 07, 2005 at 03:39:44PM +0200, Sascha Sommer CVS wrote:
> CVS change done by Sascha Sommer CVS
> 
> Update of /cvsroot/mplayer/main/libvo
> In directory mail:/var2/tmp/cvs-serv26245/libvo
> 
> Modified Files:
> 	vo_directx.c 
> Log Message:
> match the declaration in the includes to make it compile with gcc 4.1, patch by Gianluigi Tiesi <mplayer at netfarm.it>
> 
> Index: vo_directx.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
> retrieving revision 1.52
> retrieving revision 1.53
> diff -u -r1.52 -r1.53
> --- vo_directx.c	13 May 2005 10:46:11 -0000	1.52
> +++ vo_directx.c	7 Jun 2005 13:39:41 -0000	1.53
> @@ -95,12 +95,12 @@
>   * Defining them here allows us to get rid of the dxguid library during
>   * the linking stage.
>   *****************************************************************************/
> -static const GUID IID_IDirectDraw7 =
> +const GUID IID_IDirectDraw7 =
>  {
>  	0x15e65ec0,0x3b9c,0x11d2,{0xb9,0x2f,0x00,0x60,0x97,0x97,0xea,0x5b}
>  };
>  
> -static const GUID IID_IDirectDrawColorControl =
> +const GUID IID_IDirectDrawColorControl =
>  {
>  	0x4b9f0ee0,0x0d7e,0x11d0,{0x9b,0x06,0x00,0xa0,0xc9,0x03,0xa3,0xb8}
>  }; 

But if you do this, then every IID used in any windows version of
MPlayer will have to be defined by us.  If ever we link with -luuid
then we will have conflicts.

Why does gcc 4.1 treat this as an error?  I suspect it should not.  Is
there any other solution for this?

--Joey

-- 
"I tell you:  one must still have chaos in oneself to give
birth to a dancing star!" --Nietzsche