[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23608] trunk/blender/source/gameengine/ VideoTexture/VideoFFmpeg.h: * due to the setup of headers in mingw 4.4.0, includes could mess up.
Nathan Letwory
jesterking at letwory.net
Fri Oct 2 17:51:26 CEST 2009
Revision: 23608
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23608
Author: jesterking
Date: 2009-10-02 17:51:25 +0200 (Fri, 02 Oct 2009)
Log Message:
-----------
* due to the setup of headers in mingw 4.4.0, includes could mess up. Making sure that windows.h isn't included where it shouln't (outside of __cplusplus)
Modified Paths:
--------------
trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
Modified: trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2009-10-02 15:27:26 UTC (rev 23607)
+++ trunk/blender/source/gameengine/VideoTexture/VideoFFmpeg.h 2009-10-02 15:51:25 UTC (rev 23608)
@@ -24,6 +24,7 @@
#ifdef WITH_FFMPEG
extern "C" {
+#undef __cplusplus
#include <pthread.h>
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h>
@@ -32,6 +33,7 @@
#include "DNA_listBase.h"
#include "BLI_threads.h"
#include "BLI_blenlib.h"
+#define __cplusplus
}
More information about the Bf-blender-cvs
mailing list