diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-30 01:38:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-30 01:38:23 +0400 |
| commit | 65baf6ca5c92d7e12cedafef7a37b87d3bb37e94 (patch) | |
| tree | ad34f8c3d52db0def727a7a483d53c3afd6e3233 /source/blender/blenlib/BLI_sys_types.h | |
| parent | e9f0b1ad0aeb0c9ae03d3461a10e61fa9a56fd5e (diff) | |
remove duplicate sys-types headers.
also change define checks in BLI_sys_types.h (was warning a lot in linux about unused defines).
Diffstat (limited to 'source/blender/blenlib/BLI_sys_types.h')
| -rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index 96eb68e288e..e544006fd69 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -48,7 +48,7 @@ extern "C" { #endif /* MSVC 2010 and 2012 (>=1600) have stdint.h so we should use this for consistency */ -#if defined(_WIN32) && !defined(FREE_WINDOWS) && _MSC_VER <= 1500 +#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER <= 1500 /* The __intXX are built-in types of the visual compiler! So we don't * need to include anything else here. */ @@ -101,7 +101,7 @@ typedef uint64_t u_int64_t; #include <inttypes.h> /* MinGW and MSVC >= 2010 */ -#elif defined(FREE_WINDOWS) || _MSC_VER >= 1600 +#elif defined(FREE_WINDOWS) || (defined(_MSC_VER) && _MSC_VER >= 1600) #include <stdint.h> #else |