diff options
| author | Irie Shinsuke <irieshinsuke@yahoo.co.jp> | 2013-10-17 10:40:35 +0400 |
|---|---|---|
| committer | Irie Shinsuke <irieshinsuke@yahoo.co.jp> | 2013-10-17 10:40:35 +0400 |
| commit | bf462838b346e93ca2c149dde0762ead9634d141 (patch) | |
| tree | 132adc32c2ea4190206e52d7469469d283ef4a93 /source/blender/blenlib/BLI_sys_types.h | |
| parent | d3a89fc9b7acbc394799904795e30cbead3a458e (diff) | |
Fix build failure with VS2012 + SCons, caused by redefinition of the bool type.
Diffstat (limited to 'source/blender/blenlib/BLI_sys_types.h')
| -rw-r--r-- | source/blender/blenlib/BLI_sys_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h index e544006fd69..0b7f07e3d36 100644 --- a/source/blender/blenlib/BLI_sys_types.h +++ b/source/blender/blenlib/BLI_sys_types.h @@ -116,7 +116,7 @@ typedef uint64_t u_int64_t; * use (bool, true / false) instead */ #ifdef HAVE_STDBOOL_H # include <stdbool.h> -#else +#elif !defined(__bool_true_false_are_defined) && !defined(__BOOL_DEFINED) # ifndef HAVE__BOOL # ifdef __cplusplus typedef bool _BLI_Bool; |