[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53488] trunk/blender/source/blender/ blenlib/BLI_utildefines.h: Intent to fix windows not compiling after r53480 .

[Bastien Montagne]

Revision: 53488
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53488
Author:   mont29
Date:     2013-01-01 18:18:45 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Intent to fix windows not compiling after r53480.

Looks like _Bool is also a type in std (at least with msvc), so the 'typdef bool _Bool;' generates a name collision... Now using _BLI_Bool as placeholder instead.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53480

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

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h	2013-01-01 16:42:35 UTC (rev 53487)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h	2013-01-01 18:18:45 UTC (rev 53488)
@@ -39,12 +39,14 @@
 #else
 # ifndef HAVE__BOOL
 #  ifdef __cplusplus
-typedef bool _Bool;
+typedef bool _BLI_Bool;
 #  else
-#   define _Bool signed char
+#   define _BLI_Bool signed char
 #  endif
+# else
+#  define _BLI_Bool _Bool
 # endif
-# define bool _Bool
+# define bool _BLI_Bool
 # define false 0
 # define true 1
 # define __bool_true_false_are_defined 1
@@ -53,6 +55,7 @@
 /* remove this when we're ready to remove TRUE/FALSE completely */
 #ifdef WITH_BOOL_COMPAT
 /* interim until all occurrences of these can be updated to stdbool */
+/* XXX Why not use the true/false velues here? */
 # ifndef FALSE
 #   define FALSE 0
 # endif