diff options
| author | Johannes Schickel | 2012-03-17 22:02:16 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-03-17 22:02:44 +0100 |
| commit | 223794fb383637944c3b161c04ecc233a354c9ae (patch) | |
| tree | d28b6822b93e7ee764c669657368ff38f9b08e97 /common | |
| parent | 2c0bd426fcd2d965ca5f84fde893719ddfc4c37f (diff) | |
| download | scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.tar.gz scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.tar.bz2 scummvm-rg350-223794fb383637944c3b161c04ecc233a354c9ae.zip | |
ALL: Make use of defined() for the preprocessor consistent.
This does not change the use of defined for some NDS source files, since they
seem to be (based on?) third party code.
Diffstat (limited to 'common')
| -rw-r--r-- | common/ptr.h | 4 | ||||
| -rw-r--r-- | common/scummsys.h | 2 | ||||
| -rw-r--r-- | common/singleton.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/common/ptr.h b/common/ptr.h index 725d97ec7e..f734ec133f 100644 --- a/common/ptr.h +++ b/common/ptr.h @@ -103,7 +103,7 @@ private: */ template<class T> class SharedPtr { -#if !defined __GNUC__ || GCC_ATLEAST(3, 0) +#if !defined(__GNUC__) || GCC_ATLEAST(3, 0) template<class T2> friend class SharedPtr; #endif public: @@ -200,7 +200,7 @@ public: * This should just be used for debugging purposes. */ RefValue refCount() const { return _refCount ? *_refCount : 0; } -#if !defined __GNUC__ || GCC_ATLEAST(3, 0) +#if !defined(__GNUC__) || GCC_ATLEAST(3, 0) private: #endif void decRef() { diff --git a/common/scummsys.h b/common/scummsys.h index 161613b296..2f4efe702f 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -319,7 +319,7 @@ #define scumm_va_copy va_copy #elif defined(__va_copy) #define scumm_va_copy __va_copy - #elif defined(_MSC_VER) || defined (__SYMBIAN32__) + #elif defined(_MSC_VER) || defined(__SYMBIAN32__) #define scumm_va_copy(dst, src) ((dst) = (src)) #else #error scumm_va_copy undefined for this port diff --git a/common/singleton.h b/common/singleton.h index a4f106c9d3..d7078360f3 100644 --- a/common/singleton.h +++ b/common/singleton.h @@ -44,7 +44,7 @@ private: * and you specialise makeInstance to return an instance of a subclass. */ //template<class T> -#if defined (_WIN32_WCE) || defined (_MSC_VER) || defined (__WINS__) +#if defined(_WIN32_WCE) || defined(_MSC_VER) || defined(__WINS__) //FIXME evc4 and msvc7 doesn't like it as private member public: #endif |