X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdecklink%2FStdAfx.h;h=f84755efc1fe8a6a8fea200b55b9b1c0d3ff6231;hb=738a4dee5e5270c8b9ede8825da35c4b4c7298e2;hp=c2278fff883fbc1910a2166d121ada8161d5c51f;hpb=5e60fa5a9c734ef95e4067c020e3e38acc71b37c;p=casparcg

diff --git a/modules/decklink/StdAfx.h b/modules/decklink/StdAfx.h
index c2278fff8..f84755efc 100644
--- a/modules/decklink/StdAfx.h
+++ b/modules/decklink/StdAfx.h
@@ -1,87 +1,96 @@
-/*
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
-*
-* This file is part of CasparCG (www.casparcg.com).
-*
-* CasparCG is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* CasparCG is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
-*
-* Author: Robert Nagy, ronag89@gmail.com
-*/
-
-#pragma once
-
-#ifdef _DEBUG
-#include <crtdbg.h>
-#endif
-
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-
-#include <Windows.h>
-
-#include <algorithm>
-#include <array>
-#include <assert.h>
-#include <deque>
-#include <functional>
-#include <math.h>
-#include <memory>
-#include <queue>
-#include <string>
-#include <vector>
-#include <tbb/atomic.h>
-#include <tbb/concurrent_queue.h>
-#include <tbb/cache_aligned_allocator.h>
-#include <boost/assign.hpp>
-#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>
-#include <boost/algorithm/string.hpp>
-
-#if defined(_MSC_VER)
-#pragma warning (push)
-#pragma warning (disable : 4244)
-#endif
-extern "C" 
-{
-	#define __STDC_CONSTANT_MACROS
-	#define __STDC_LIMIT_MACROS
-	#include <libavcodec/avcodec.h>
-}
-#if defined(_MSC_VER)
-#pragma warning (pop)
-#endif
-
-#pragma warning(push)
-#pragma warning(disable : 4996)
-
-	#include <atlbase.h>
-
-	#include <atlcom.h>
-	#include <atlhost.h>
-
-#pragma warning(push)
-
-#include <functional>
-
-
-#include "../common/memory/safe_ptr.h"
-#include "../common/utf.h"
-#include "../common/exception/exceptions.h"
-#include "../common/exception/win32_exception.h"
-#include "../common/log.h"
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#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>
+#include <assert.h>
+#include <deque>
+#include <functional>
+#include <math.h>
+#include <memory>
+#include <queue>
+#include <string>
+#include <vector>
+#include <tbb/atomic.h>
+#include <tbb/concurrent_queue.h>
+#include <tbb/cache_aligned_allocator.h>
+#include <boost/circular_buffer.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/range.hpp>
+#include <boost/range/algorithm.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/algorithm/string.hpp>
+
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable : 4244)
+#endif
+extern "C" 
+{
+	#define __STDC_CONSTANT_MACROS
+	#define __STDC_LIMIT_MACROS
+	#include <libavcodec/avcodec.h>
+}
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
+#pragma warning(push)
+#pragma warning(disable : 4996)
+
+#if defined(_MSC_VER)
+    #include <atlbase.h>
+
+	#include <atlcom.h>
+	#include <atlhost.h>
+#endif
+
+#pragma warning(pop)
+
+#include <functional>
+
+
+#include "../common/memory.h"
+#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
+