diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/endian.h | 3 | ||||
| -rw-r--r-- | common/singleton.h | 4 | ||||
| -rw-r--r-- | common/util.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/common/endian.h b/common/endian.h index 529e7f5ac0..6d6563f802 100644 --- a/common/endian.h +++ b/common/endian.h @@ -92,8 +92,7 @@ return __builtin_bswap32(a); } -// test for MSVC 7 or newer -#elif defined(_MSC_VER) && _MSC_VER >= 1300 +#elif defined(_MSC_VER) FORCEINLINE uint32 SWAP_BYTES_32(uint32 a) { return _byteswap_ulong(a); diff --git a/common/singleton.h b/common/singleton.h index 13bdb0c3a3..9bcd590183 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -44,8 +44,8 @@ private: * and you specialise makeInstance to return an instance of a subclass. */ //template<class T> -#if defined(_WIN32_WCE) || defined(_MSC_VER) || defined(__WINS__) -//FIXME evc4 and msvc7 doesn't like it as private member +#if defined(__WINS__) +//FIXME verify if __WINS__ needs this still public: #endif static T *makeInstance() { diff --git a/common/util.h b/common/util.h index 1c0e45662e..f51aa00925 100644 --- a/common/util.h +++ b/common/util.h @@ -72,7 +72,7 @@ template<typename T> inline void SWAP(T &a, T &b) { T tmp = a; a = b; b = tmp; } # define SCUMMVM_CURRENT_FUNCTION __PRETTY_FUNCTION__ #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) # define SCUMMVM_CURRENT_FUNCTION __func__ -#elif defined(_MSC_VER) && _MSC_VER >= 1300 +#elif defined(_MSC_VER) # define SCUMMVM_CURRENT_FUNCTION __FUNCTION__ #else # define SCUMMVM_CURRENT_FUNCTION "<unknown>" |