diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 14:54:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-04 14:54:56 +0400 |
| commit | f4ed44fb0ce8fd6a14c0966272807885ee33f63b (patch) | |
| tree | 93a6d7a5371704649196a6580546939ffaf745f3 /source/gameengine | |
| parent | dd862077da91742daf6970aaefc9595537fd39f9 (diff) | |
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).
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <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 @@ extern "C" { #include "DNA_listBase.h" #include "BLI_threads.h" #include "BLI_blenlib.h" -#define __cplusplus +// #define __cplusplus } #if LIBAVFORMAT_VERSION_INT < (49 << 16) |