[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45392] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.h: fix for building on linux with gcc4.7, an error was caused by undefining __cplusplus, so as to work with mingw4.4

[Bastien Montagne]

Now I’m feeling stupid – I made a bug report on gcc bt about this just 
yesterday evening!

Anyway, thanks for fixing it! :)

Le mercredi 4 avril 2012 12:55:05, Campbell Barton a écrit :
> Revision: 45392
>            http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45392
> Author:   campbellbarton
> Date:     2012-04-04 10:54:56 +0000 (Wed, 04 Apr 2012)
> Log Message:
> -----------
> fix for building on linux with gcc4.7, an error was caused by undefining __cplusplus, so as to work with mingw4.4
>
> this was added in r23608 so hopefully we can get buy now without it - or only undefine this in mingw if the problem still exists (cant test now).
>
> Revision Links:
> --------------
>      http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=23608
>
> Modified Paths:
> --------------
>      trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
>
> Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
> ===================================================================
> --- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-04-04 06:02:10 UTC (rev 45391)
> +++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h	2012-04-04 10:54:56 UTC (rev 45392)
> @@ -33,7 +33,7 @@
>   #include<inttypes.h>
>   #endif
>   extern "C" {
> -#undef __cplusplus
> +// #undef __cplusplus // was done for mingw4.4, see r23608
>   #include<pthread.h>
>
>   #include "ffmpeg_compat.h"
> @@ -41,7 +41,7 @@
>   #include "DNA_listBase.h"
>   #include "BLI_threads.h"
>   #include "BLI_blenlib.h"
> -#define __cplusplus
> +// #define __cplusplus
>   }
>
>   #if LIBAVFORMAT_VERSION_INT<  (49<<  16)
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>