diff options
| author | hrydgard <hrydgard@gmail.com> | 2008-09-07 10:29:46 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2008-09-07 10:29:46 +0000 |
| commit | 5a69fca0be4c00267a0e8c4fbbb4b6bdafe7213d (patch) | |
| tree | a55106a1565226fe72ec5d90166e8ef5a54be0dd /Source/Core/VideoCommon/Src/Profiler.cpp | |
| parent | 5ac0c33530b1e9362d7c002b838179da89de1d03 (diff) | |
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
Diffstat (limited to 'Source/Core/VideoCommon/Src/Profiler.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/Profiler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Src/Profiler.cpp b/Source/Core/VideoCommon/Src/Profiler.cpp index 6a66cdc006..e47118409a 100644 --- a/Source/Core/VideoCommon/Src/Profiler.cpp +++ b/Source/Core/VideoCommon/Src/Profiler.cpp @@ -33,7 +33,11 @@ int g_bWriteProfile=0; #ifdef _WIN32
#if defined (_MSC_VER) && _MSC_VER >= 1400
+#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
#pragma intrinsic(__rdtsc)
#endif
|