diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-15 06:15:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-15 06:15:07 +0400 |
| commit | 4d4664d98f49cfb171a43bd6ae6bb002b5f3c34b (patch) | |
| tree | e458f200b0061c4adec3a0d5b8f7f523b647c036 /intern/ghost | |
| parent | 977aaeb95c2946f2c8d83dd6a15979424a869eda (diff) | |
code cleanup: check for msvc directly when using warning pragma's.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_Debug.h | 4 | ||||
| -rw-r--r-- | intern/ghost/test/multitest/MultiTest.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index c6d364c361c..9b563ef7e55 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -50,7 +50,7 @@ typedef unsigned short GHOST_TUns16; typedef int GHOST_TInt32; typedef unsigned int GHOST_TUns32; -#if defined(WIN32) && !defined(FREE_WINDOWS) +#ifdef _MSC_VER typedef __int64 GHOST_TInt64; typedef unsigned __int64 GHOST_TUns64; #else diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index c364f1d26a4..f0db1b3de8d 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -33,12 +33,12 @@ #ifndef __GHOST_DEBUG_H__ #define __GHOST_DEBUG_H__ -#if defined(WIN32) && !defined(FREE_WINDOWS) +#ifdef _MSC_VER # ifdef DEBUG # pragma warning (disable:4786) // suppress stl-MSVC debug info warning // #define GHOST_DEBUG # endif // DEBUG -#endif // WIN32 +#endif // _MSC_VER #ifdef WITH_GHOST_DEBUG # define GHOST_DEBUG // spit ghost events to stdout diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 5d207dafaaf..2d0afcf671c 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -26,9 +26,8 @@ */ #define FALSE 0 -#ifdef WIN32 - -#pragma warning(disable: 4244 4305) +#ifdef _MSC_VER +# pragma warning(disable: 4244 4305) #endif #include <stdlib.h> |