From f4ed44fb0ce8fd6a14c0966272807885ee33f63b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Apr 2012 10:54:56 +0000 Subject: 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). --- source/gameengine/VideoTexture/VideoFFmpeg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/gameengine') diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.h b/source/gameengine/VideoTexture/VideoFFmpeg.h index 40b2658eb42..ee4354e256e 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.h +++ b/source/gameengine/VideoTexture/VideoFFmpeg.h @@ -33,7 +33,7 @@ http://www.gnu.org/copyleft/lesser.txt. #include #endif extern "C" { -#undef __cplusplus +// #undef __cplusplus // was done for mingw4.4, see r23608 #include #include "ffmpeg_compat.h" @@ -41,7 +41,7 @@ extern "C" { #include "DNA_listBase.h" #include "BLI_threads.h" #include "BLI_blenlib.h" -#define __cplusplus +// #define __cplusplus } #if LIBAVFORMAT_VERSION_INT < (49 << 16) -- cgit v1.2.3