Merged INFO THREADS from 2.0

[casparcg] / common / os / windows / windows.h

diff --git a/common/os/windows/windows.h b/common/os/windows/windows.h
index b1afff9eaa66ab7c298bd52766bc382511a01826..bbee8206a9fd4c4ff3728bef10a7d976ba6b3607 100644 (file)
--- a/common/os/windows/windows.h
+++ b/common/os/windows/windows.h
@@ -1,26 +1,26 @@
-#pragma once\r
-\r
-#undef _UNICODE\r
-#define _UNICODE\r
-#undef UNICODE\r
-#define UNICODE\r
-\r
-#undef NOMINMAX\r
-#define NOMINMAX\r
-\r
-#undef NOSERVICE\r
-#define NOSERVICE\r
-#undef NOMCX\r
-#define NOMCX\r
-\r
-#ifdef _MSC_VER\r
-#      include <SDKDDKVer.h>\r
-#endif\r
-#ifndef _WIN32_WINNT\r
-#define _WIN32_WINNT _WIN32_WINNT_WIN7\r
-#endif\r
-\r
-#undef WIN32_LEAN_AND_MEAN\r
-#define WIN32_LEAN_AND_MEAN\r
-\r
-#include <windows.h>
\ No newline at end of file
+#pragma once
+
+#undef _UNICODE
+#define _UNICODE
+#undef UNICODE
+#define UNICODE
+
+#undef NOMINMAX
+#define NOMINMAX
+
+#undef NOSERVICE
+#define NOSERVICE
+#undef NOMCX
+#define NOMCX
+
+#ifdef _MSC_VER
+#      include <SDKDDKVer.h>
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT _WIN32_WINNT_WIN7
+#endif
+
+#undef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+
+#include <windows.h>