[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60811] trunk/blender/source/blender/ blenlib/BLI_sys_types.h: Fix build failure with VS2012 + SCons, caused by redefinition of the bool type.

[Shinsuke Irie]

Revision: 60811
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60811
Author:   irie
Date:     2013-10-17 06:40:35 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix build failure with VS2012 + SCons, caused by redefinition of the bool type.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_sys_types.h

Modified: trunk/blender/source/blender/blenlib/BLI_sys_types.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_sys_types.h	2013-10-17 03:18:21 UTC (rev 60810)
+++ trunk/blender/source/blender/blenlib/BLI_sys_types.h	2013-10-17 06:40:35 UTC (rev 60811)
@@ -116,7 +116,7 @@
  * 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;