[streaming_consumer] Default to pcm_s24le for containers supporting it instead of...

[casparcg] / modules / decklink / StdAfx.h

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index 94a128626546f9b5e8b45cc9d5d31f4c7222a5de..f84755efc1fe8a6a8fea200b55b9b1c0d3ff6231 100644 (file)
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -21,14 +21,17 @@
 
 #pragma once
 
-#ifdef _DEBUG
+#ifdef __cplusplus
+#if defined _DEBUG && defined _MSC_VER
 #include <crtdbg.h>
 #endif
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
 
+#if defined(_MSC_VER)
 #include <Windows.h>
+#endif
 
 #include <algorithm>
 #include <array>
@@ -44,9 +47,7 @@
 #include <tbb/concurrent_queue.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <boost/circular_buffer.hpp>
-#include <boost/timer.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
 #include <boost/range.hpp>
 #include <boost/range/algorithm.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -69,12 +70,14 @@ extern "C"
 #pragma warning(push)
 #pragma warning(disable : 4996)
 
-       #include <atlbase.h>
+#if defined(_MSC_VER)
+    #include <atlbase.h>
 
        #include <atlcom.h>
        #include <atlhost.h>
+#endif
 
-#pragma warning(push)
+#pragma warning(pop)
 
 #include <functional>
 
@@ -83,3 +86,11 @@ extern "C"
 #include "../common/utf.h"
 #include "../common/except.h"
 #include "../common/log.h"
+#include "../common/timer.h"
+#endif
+
+#if defined(_MSC_VER)
+#include <rpc.h>
+#include <rpcndr.h>
+#endif
+