diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-09-13 07:27:43 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-09-29 19:19:08 +0400 |
commit | 218b5f7cd66d6b9d3558793760df738fd70eaa4d (patch) | |
tree | a897f0aeb436b0ae966fe0b0cde06b672373d05d /src | |
parent | a73e5349aa7e1213a115412b408025bf10a59bb4 (diff) |
Remove workaround for the C4005 warnings.
The issue is fixed in VS2012.
Diffstat (limited to 'src')
-rw-r--r-- | src/DSUtil/AudioTools.h | 5 | ||||
-rw-r--r-- | src/mpc-hc/Ifo.h | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/DSUtil/AudioTools.h b/src/DSUtil/AudioTools.h index ed154f192..2232dc39d 100644 --- a/src/DSUtil/AudioTools.h +++ b/src/DSUtil/AudioTools.h @@ -20,12 +20,7 @@ #pragma once -// TODO: remove this when it's fixed in MSVC -// Work around warning C4005: 'XXXX' : macro redefinition -#pragma warning(push) -#pragma warning(disable: 4005) #include <stdint.h> -#pragma warning(pop) #define INT24_MAX 8388607 #define INT24_MIN (-8388608) diff --git a/src/mpc-hc/Ifo.h b/src/mpc-hc/Ifo.h index 8ab1e0fbd..2bad398b4 100644 --- a/src/mpc-hc/Ifo.h +++ b/src/mpc-hc/Ifo.h @@ -20,12 +20,7 @@ #pragma once
-// TODO: remove this when it's fixed in MSVC
-// Work around warning C4005: 'XXXX' : macro redefinition
-#pragma warning(push)
-#pragma warning(disable: 4005)
#include <stdint.h>
-#pragma warning(pop)
#pragma pack(push, 1)
|