[Bf-blender-cvs] [918fd5b] experimental-build: Found conflict with FFmpeg stdint.h, try a fix

[Benoit Bolsee]

Commit: 918fd5b97735b023f001c567d85bb17b8b7abd0d
Author: Benoit Bolsee
Date:   Thu May 19 17:13:32 2016 +0200
Branches: experimental-build
https://developer.blender.org/rB918fd5b97735b023f001c567d85bb17b8b7abd0d

Found conflict with FFmpeg stdint.h, try a fix

===================================================================

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 0bd4329..aceaed7 100644
--- a/source/gameengine/VideoTexture/DeckLink.cpp
+++ b/source/gameengine/VideoTexture/DeckLink.cpp
@@ -33,6 +33,10 @@
 
 // implementation
 
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
+#endif
+
 #include "atomic_ops.h"
 
 #include "EXP_PyObjectPlus.h"
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp
index 45c80af..275ffa7 100644
--- a/source/gameengine/VideoTexture/VideoDeckLink.cpp
+++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp
@@ -32,8 +32,8 @@
 #ifdef WITH_DECKLINK
 
 // INT64_C fix for some linux machines (C99ism)
-#ifndef __STDC_CONSTANT_MACROS
-#define __STDC_CONSTANT_MACROS
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS
 #endif
 #include <stdint.h>
 #include <string.h>