[x265-commits] [x265] xp: fix build with XP headers
Steve Borho
steve at borho.org
Sat Apr 12 23:20:34 CEST 2014
details: http://hg.videolan.org/x265/rev/483e5077a6b7
branches:
changeset: 6696:483e5077a6b7
user: Steve Borho <steve at borho.org>
date: Fri Apr 11 21:51:01 2014 -0500
description:
xp: fix build with XP headers
diffstat:
source/common/winxp.cpp | 2 +-
source/common/winxp.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (28 lines):
diff -r 850ebca2f7c8 -r 483e5077a6b7 source/common/winxp.cpp
--- a/source/common/winxp.cpp Fri Apr 11 14:52:11 2014 -0500
+++ b/source/common/winxp.cpp Fri Apr 11 21:51:01 2014 -0500
@@ -23,7 +23,7 @@
#include "threading.h"
-#if defined(_WIN32) && (_WIN32_WINNT <_WIN32_WINNT_VISTA)
+#if defined(_WIN32) && (_WIN32_WINNT < 0x0600) // _WIN32_WINNT_VISTA
namespace x265
{
diff -r 850ebca2f7c8 -r 483e5077a6b7 source/common/winxp.h
--- a/source/common/winxp.h Fri Apr 11 14:52:11 2014 -0500
+++ b/source/common/winxp.h Fri Apr 11 21:51:01 2014 -0500
@@ -24,7 +24,11 @@
#ifndef X265_WINXP_H
#define X265_WINXP_H
-#if defined(_WIN32) && (_WIN32_WINNT < _WIN32_WINNT_VISTA)
+#if defined(_WIN32) && (_WIN32_WINNT < 0x0600) // _WIN32_WINNT_VISTA
+
+#ifdef _MSC_VER
+#include <intrin.h> // _InterlockedCompareExchange64
+#endif
namespace x265
{
More information about the x265-commits
mailing list