From bf462838b346e93ca2c149dde0762ead9634d141 Mon Sep 17 00:00:00 2001
From: Irie Shinsuke <irieshinsuke@yahoo.co.jp>
Date: Thu, 17 Oct 2013 06:40:35 +0000
Subject: Fix build failure with VS2012 + SCons, caused by redefinition of the
 bool type.

---
 source/blender/blenlib/BLI_sys_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source')

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;
-- 
cgit v1.2.3