Fix build failure with VS2012 + SCons, caused by redefinition of the bool type.

2013-10-17 06:40:35 +00:00 · 2013-10-17 06:40:35 +00:00 · bf462838b3
commit bf462838b3
parent d3a89fc9b7
1 changed files with 1 additions and 1 deletions
--- 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;