From 5a69fca0be4c00267a0e8c4fbbb4b6bdafe7213d Mon Sep 17 00:00:00 2001
From: hrydgard <hrydgard@gmail.com>
Date: Sun, 7 Sep 2008 10:29:46 +0000
Subject: Add some missing GPL headers, fix building with Platform SDK 6.0,
 delete unused HTTP code.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@452 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Common/Src/CPUDetect.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Source/Core/Common/Src/CPUDetect.cpp')

diff --git a/Source/Core/Common/Src/CPUDetect.cpp b/Source/Core/Common/Src/CPUDetect.cpp
index 09827c3227..181d74dc79 100644
--- a/Source/Core/Common/Src/CPUDetect.cpp
+++ b/Source/Core/Common/Src/CPUDetect.cpp
@@ -17,7 +17,11 @@
 #include <memory.h>
 
 #ifdef _WIN32
+#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
+#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
 #include <intrin.h>
+#undef _interlockedbittestandset
+#undef _interlockedbittestandreset
 #else
 
 //#include <config/i386/cpuid.h>
-- 
cgit v1.2.3