Commit: 31976ca62445cf1b1f25d9c6d90e99f7b94ef949 Author: Benoit Bolsee Date: Thu May 19 11:54:16 2016 +0200 Branches: decklink https://developer.blender.org/rB31976ca62445cf1b1f25d9c6d90e99f7b94ef949
Try to fix atomic_ops on buildbot by moving include to top =================================================================== M source/gameengine/VideoTexture/DeckLink.cpp M source/gameengine/VideoTexture/VideoDeckLink.cpp =================================================================== diff --git a/source/gameengine/VideoTexture/DeckLink.cpp b/source/gameengine/VideoTexture/DeckLink.cpp index 6b9e5d9..0bd4329 100644 --- a/source/gameengine/VideoTexture/DeckLink.cpp +++ b/source/gameengine/VideoTexture/DeckLink.cpp @@ -33,11 +33,12 @@ // implementation +#include "atomic_ops.h" + #include "EXP_PyObjectPlus.h" #include "KX_KetsjiEngine.h" #include "KX_PythonInit.h" #include "DeckLink.h" -#include "atomic_ops.h" #include <memory.h> diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp index ae1e3eb..45c80af 100644 --- a/source/gameengine/VideoTexture/VideoDeckLink.cpp +++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp @@ -43,6 +43,8 @@ #include <sys/mman.h> #endif +#include "atomic_ops.h" + #include "MEM_guardedalloc.h" #include "PIL_time.h" #include "VideoDeckLink.h" @@ -50,7 +52,6 @@ #include "Exception.h" #include "KX_KetsjiEngine.h" #include "KX_PythonInit.h" -#include "atomic_ops.h" extern ExceptionID DeckLinkInternalError; ExceptionID SourceVideoOnlyCapture, VideoDeckLinkBadFormat, VideoDeckLinkOpenCard, VideoDeckLinkDvpInternalError, VideoDeckLinkPinMemoryError; _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
